#endif
static
-struct bt_definition *_struct_definition_new(struct declaration *declaration,
+struct bt_definition *_struct_definition_new(struct bt_declaration *declaration,
struct definition_scope *parent_scope,
GQuark field_name, int index,
const char *root_name);
}
static
-void _struct_declaration_free(struct declaration *declaration)
+void _struct_declaration_free(struct bt_declaration *declaration)
{
struct declaration_struct *struct_declaration =
container_of(declaration, struct declaration_struct, p);
uint64_t min_align)
{
struct declaration_struct *struct_declaration;
- struct declaration *declaration;
+ struct bt_declaration *declaration;
struct_declaration = g_new(struct declaration_struct, 1);
declaration = &struct_declaration->p;
static
struct bt_definition *
- _struct_definition_new(struct declaration *declaration,
+ _struct_definition_new(struct bt_declaration *declaration,
struct definition_scope *parent_scope,
GQuark field_name, int index,
const char *root_name)
void bt_struct_declaration_add_field(struct declaration_struct *struct_declaration,
const char *field_name,
- struct declaration *field_declaration)
+ struct bt_declaration *field_declaration)
{
struct declaration_field *field;
unsigned long index;
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.
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);
}
/*
* 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)
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;
}