ctf.fs: bt_ctf_notif_iter_create(): assert() that all medops exist

[babeltrace.git] / types / struct.c

diff --git a/types/struct.c b/types/struct.c
index b9fb6799b938dad37f6788c5bb14cafda8fa571d..e2f6a1e11912308deb6622d2c84f5a67b2152b3b 100644 (file)
--- a/types/struct.c
+++ b/types/struct.c
@@ -196,8 +196,8 @@ void bt_struct_declaration_add_field(struct declaration_struct *struct_declarati
        field->declaration = field_declaration;
        /* Keep index in hash rather than pointer, because array can relocate */
        g_hash_table_insert(struct_declaration->fields_by_name,
-                           (gpointer) (unsigned long) field->name,
-                           (gpointer) index);
+                           GUINT_TO_POINTER(field->name),
+                           GUINT_TO_POINTER(index));
        /*
         * Alignment of structure is the max alignment of declarations contained
         * therein.
@@ -219,11 +219,11 @@ int bt_struct_declaration_lookup_field_index(struct declaration_struct *struct_d
        gboolean found;
 
        found = g_hash_table_lookup_extended(struct_declaration->fields_by_name,
-                                   (gconstpointer) (unsigned long) field_name,
+                                   (gconstpointer) GUINT_TO_POINTER(field_name),
                                    NULL, &index);
        if (!found)
                return -1;
-       return (int) (unsigned long) index;
+       return GPOINTER_TO_INT(index);
 }
 
 /*
@@ -242,7 +242,7 @@ struct declaration_field *
  * field returned only valid as long as the field structure is not appended to.
  */
 struct bt_definition *
-bt_struct_definition_get_field_from_index(struct definition_struct *_struct,
+bt_struct_definition_get_field_from_index(const struct definition_struct *_struct,
                                        int index)
 {
        if (index < 0)
@@ -250,7 +250,7 @@ bt_struct_definition_get_field_from_index(struct definition_struct *_struct,
        return g_ptr_array_index(_struct->fields, index);
 }
 
-uint64_t bt_struct_declaration_len(struct declaration_struct *struct_declaration)
+uint64_t bt_struct_declaration_len(const struct declaration_struct *struct_declaration)
 {
        return struct_declaration->fields->len;
 }