X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fvariant.c;h=ebaf43c1fdd463cff09e669627b60adc14950627;hp=a58c17ffab5ec2a498855cf6c67a609f5c26ec73;hb=2b77e6a6ff6a0b46ee3bd607d1d75f2d20af5ea0;hpb=13fad8b6d8ad53a55baca25234a0c59aeff83a3b diff --git a/types/variant.c b/types/variant.c index a58c17ff..ebaf43c1 100644 --- a/types/variant.c +++ b/types/variant.c @@ -39,13 +39,13 @@ struct definition *_variant_definition_new(struct declaration *declaration, static void _variant_definition_free(struct definition *definition); -int variant_rw(struct stream_pos *ppos, struct definition *definition) +int bt_variant_rw(struct stream_pos *ppos, struct definition *definition) { struct definition_variant *variant_definition = container_of(definition, struct definition_variant, p); struct definition *field; - field = variant_get_current_field(variant_definition); + field = bt_variant_get_current_field(variant_definition); return generic_rw(ppos, field); } @@ -56,7 +56,7 @@ void _untagged_variant_declaration_free(struct declaration *declaration) container_of(declaration, struct declaration_untagged_variant, p); unsigned long i; - free_declaration_scope(untagged_variant_declaration->scope); + bt_free_declaration_scope(untagged_variant_declaration->scope); g_hash_table_destroy(untagged_variant_declaration->fields_by_tag); for (i = 0; i < untagged_variant_declaration->fields->len; i++) { @@ -69,7 +69,7 @@ void _untagged_variant_declaration_free(struct declaration *declaration) g_free(untagged_variant_declaration); } -struct declaration_untagged_variant *untagged_variant_declaration_new( +struct declaration_untagged_variant *bt_untagged_bt_variant_declaration_new( struct declaration_scope *parent_scope) { struct declaration_untagged_variant *untagged_variant_declaration; @@ -82,7 +82,7 @@ struct declaration_untagged_variant *untagged_variant_declaration_new( untagged_variant_declaration->fields = g_array_sized_new(FALSE, TRUE, sizeof(struct declaration_field), DEFAULT_NR_STRUCT_FIELDS); - untagged_variant_declaration->scope = new_declaration_scope(parent_scope); + untagged_variant_declaration->scope = bt_new_declaration_scope(parent_scope); declaration->id = CTF_TYPE_UNTAGGED_VARIANT; declaration->alignment = 1; declaration->declaration_free = _untagged_variant_declaration_free; @@ -104,7 +104,7 @@ void _variant_declaration_free(struct declaration *declaration) } struct declaration_variant * - variant_declaration_new(struct declaration_untagged_variant *untagged_variant, const char *tag) + bt_variant_declaration_new(struct declaration_untagged_variant *untagged_variant, const char *tag) { struct declaration_variant *variant_declaration; struct declaration *declaration; @@ -144,14 +144,14 @@ int check_enum_tag(struct definition_variant *variant, * variant choice map to an enumerator too. We then validate that the * number of enumerators equals the number of variant choices. */ - if (variant->declaration->untagged_variant->fields->len != enum_get_nr_enumerators(enum_declaration)) + if (variant->declaration->untagged_variant->fields->len != bt_enum_get_nr_enumerators(enum_declaration)) return -EPERM; for (i = 0; i < variant->declaration->untagged_variant->fields->len; i++) { struct declaration_field *field_declaration = &g_array_index(variant->declaration->untagged_variant->fields, struct declaration_field, i); - if (!enum_quark_to_range_set(enum_declaration, field_declaration->name)) { + if (!bt_enum_quark_to_range_set(enum_declaration, field_declaration->name)) { missing_field = 1; break; } @@ -195,14 +195,14 @@ struct definition * */ variant->p.index = root_name ? INT_MAX : index; variant->p.name = field_name; - variant->p.path = new_definition_path(parent_scope, field_name, root_name); - variant->p.scope = new_definition_scope(parent_scope, field_name, root_name); + variant->p.path = bt_new_definition_path(parent_scope, field_name, root_name); + variant->p.scope = bt_new_definition_scope(parent_scope, field_name, root_name); - ret = register_field_definition(field_name, &variant->p, + ret = bt_register_field_definition(field_name, &variant->p, parent_scope); assert(!ret); - variant->enum_tag = lookup_path_definition(variant->p.scope->scope_path, + variant->enum_tag = bt_lookup_path_definition(variant->p.scope->scope_path, variant_declaration->tag_name, parent_scope); @@ -232,7 +232,7 @@ struct definition * variant->current_field = NULL; return &variant->p; error: - free_definition_scope(variant->p.scope); + bt_free_definition_scope(variant->p.scope); bt_declaration_unref(&variant_declaration->p); g_free(variant); return NULL; @@ -251,13 +251,13 @@ void _variant_definition_free(struct definition *definition) bt_definition_unref(field); } bt_definition_unref(variant->enum_tag); - free_definition_scope(variant->p.scope); + bt_free_definition_scope(variant->p.scope); bt_declaration_unref(variant->p.declaration); g_ptr_array_free(variant->fields, TRUE); g_free(variant); } -void untagged_variant_declaration_add_field(struct declaration_untagged_variant *untagged_variant_declaration, +void bt_untagged_variant_declaration_add_field(struct declaration_untagged_variant *untagged_variant_declaration, const char *field_name, struct declaration *field_declaration) { @@ -282,7 +282,7 @@ void untagged_variant_declaration_add_field(struct declaration_untagged_variant } struct declaration_field * -untagged_variant_declaration_get_field_from_tag(struct declaration_untagged_variant *untagged_variant_declaration, GQuark tag) +bt_untagged_variant_declaration_get_field_from_tag(struct declaration_untagged_variant *untagged_variant_declaration, GQuark tag) { gpointer index; gboolean found; @@ -301,7 +301,7 @@ untagged_variant_declaration_get_field_from_tag(struct declaration_untagged_vari /* * field returned only valid as long as the field structure is not appended to. */ -struct definition *variant_get_current_field(struct definition_variant *variant) +struct definition *bt_variant_get_current_field(struct definition_variant *variant) { struct definition_enum *_enum = container_of(variant->enum_tag, struct definition_enum, p);