Fix warnings emitted by `gcc -Wall`

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/include/babeltrace/ctf-ir/event-internal.h b/include/babeltrace/ctf-ir/event-internal.h
index c47e61f047066b25672ae983212e25179fe4dba6..553a8687dfc185c38379c97eae01cc97d9235bca 100644 (file)
--- a/include/babeltrace/ctf-ir/event-internal.h
+++ b/include/babeltrace/ctf-ir/event-internal.h
@@ -64,7 +64,6 @@ int bt_ctf_event_serialize(struct bt_ctf_event *event,
 BT_HIDDEN
 void bt_ctf_event_freeze(struct bt_ctf_event *event);
 
-BT_HIDDEN
 static inline struct bt_ctf_packet *bt_ctf_event_borrow_packet(
                struct bt_ctf_event *event)
 {

diff --git a/include/babeltrace/graph/notification-internal.h b/include/babeltrace/graph/notification-internal.h
index e13f660cf419b25bb427a56f9d49f1f823fbabc3..dac0defbcff8b9ef1635e88d0648016f5c0dd30e 100644 (file)
--- a/include/babeltrace/graph/notification-internal.h
+++ b/include/babeltrace/graph/notification-internal.h
@@ -53,7 +53,6 @@ void bt_notification_init(struct bt_notification *notification,
                enum bt_notification_type type,
                bt_object_release_func release);
 
-BT_HIDDEN
 static inline void bt_notification_freeze(struct bt_notification *notification)
 {
        notification->frozen = BT_TRUE;

diff --git a/lib/ctf-ir/field-types.c b/lib/ctf-ir/field-types.c
index 4a4d789c48e8c5c394e6706781ca8b7d6c37a5fd..78feecb9fa624715df70c2dc5b201f2fd853ac09 100644 (file)
--- a/lib/ctf-ir/field-types.c
+++ b/lib/ctf-ir/field-types.c
@@ -4714,7 +4714,6 @@ struct bt_ctf_field_type *bt_ctf_field_type_string_copy(
                struct bt_ctf_field_type *type)
 {
        struct bt_ctf_field_type *copy;
-       struct bt_ctf_field_type_string *string;
 
        BT_LOGD("Copying string field type's: addr=%p", type);
        copy = bt_ctf_field_type_string_create();
@@ -4723,8 +4722,6 @@ struct bt_ctf_field_type *bt_ctf_field_type_string_copy(
                goto end;
        }
 
-       string = container_of(type, struct bt_ctf_field_type_string,
-               parent);
        BT_LOGD("Copied string field type: original-ft-addr=%p, copy-ft-addr=%p",
                type, copy);
 end:

diff --git a/lib/ctf-ir/resolve.c b/lib/ctf-ir/resolve.c
index 2ab457ab8f3dfdba226a7f98f786f67554349fc0..86657da7283ba5f9627e9573f7110425bc778b04 100644 (file)
--- a/lib/ctf-ir/resolve.c
+++ b/lib/ctf-ir/resolve.c
@@ -399,7 +399,8 @@ int ptokens_to_field_path(GList *ptokens, struct bt_ctf_field_path *field_path,
                        bt_ctf_field_type_get_type_id(type);
 
                /* Find to which index corresponds the current path token */
-               if (type_id == CTF_TYPE_ARRAY || type_id == CTF_TYPE_SEQUENCE) {
+               if (type_id == BT_CTF_FIELD_TYPE_ID_ARRAY ||
+                               type_id == BT_CTF_FIELD_TYPE_ID_SEQUENCE) {
                        child_index = -1;
                } else {
                        child_index = bt_ctf_field_type_get_field_index(type,