static
void _struct_definition_free(struct definition *definition);
-void struct_copy(struct stream_pos *dest, const struct format *fdest,
- struct stream_pos *src, const struct format *fsrc,
- struct definition *definition)
+void struct_rw(struct stream_pos *ppos, struct definition *definition)
{
- struct definition_struct *_struct =
+ struct definition_struct *struct_definition =
container_of(definition, struct definition_struct, p);
- struct declaration_struct *struct_declaration = _struct->declaration;
unsigned long i;
- fsrc->struct_begin(src, struct_declaration);
- fdest->struct_begin(dest, struct_declaration);
-
- for (i = 0; i < _struct->fields->len; i++) {
- struct field *field = &g_array_index(_struct->fields,
+ for (i = 0; i < struct_definition->fields->len; i++) {
+ struct field *field = &g_array_index(struct_definition->fields,
struct field, i);
- struct declaration *field_declaration = field->definition->declaration;
-
- field_declaration->copy(dest, fdest, src, fsrc, field->definition);
-
+ generic_rw(ppos, field->definition);
}
- fsrc->struct_end(src, struct_declaration);
- fdest->struct_end(dest, struct_declaration);
}
static
g_free(struct_declaration);
}
-struct declaration_struct *struct_declaration_new(const char *name,
- struct declaration_scope *parent_scope)
+struct declaration_struct *
+ struct_declaration_new(struct declaration_scope *parent_scope)
{
struct declaration_struct *struct_declaration;
struct declaration *declaration;
DEFAULT_NR_STRUCT_FIELDS);
struct_declaration->scope = new_declaration_scope(parent_scope);
declaration->id = CTF_TYPE_STRUCT;
- declaration->name = g_quark_from_string(name);
declaration->alignment = 1;
- declaration->copy = struct_copy;
declaration->declaration_free = _struct_declaration_free;
declaration->definition_new = _struct_definition_new;
declaration->definition_free = _struct_definition_free;
field_declaration->alignment);
}
-unsigned long
- struct_declaration_lookup_field_index(struct declaration_struct *struct_declaration,
+/*
+ * struct_declaration_lookup_field_index - returns field index
+ *
+ * Returns the index of a field in a structure, or -1 if it does not
+ * exist.
+ */
+int struct_declaration_lookup_field_index(struct declaration_struct *struct_declaration,
GQuark field_name)
{
- unsigned long index;
-
- index = (unsigned long) g_hash_table_lookup(struct_declaration->fields_by_name,
- (gconstpointer) (unsigned long) field_name);
- return index;
+ gpointer index;
+ gboolean found;
+
+ found = g_hash_table_lookup_extended(struct_declaration->fields_by_name,
+ (gconstpointer) (unsigned long) field_name,
+ NULL, &index);
+ if (!found)
+ return -1;
+ return (int) (unsigned long) index;
}
/*
*/
struct declaration_field *
struct_declaration_get_field_from_index(struct declaration_struct *struct_declaration,
- unsigned long index)
+ int index)
{
+ if (index < 0)
+ return NULL;
return &g_array_index(struct_declaration->fields, struct declaration_field, index);
}
*/
struct field *
struct_definition_get_field_from_index(struct definition_struct *_struct,
- unsigned long index)
+ int index)
{
+ if (index < 0)
+ return NULL;
return &g_array_index(_struct->fields, struct field, index);
}