Namespace the struct definition

[babeltrace.git] / types / variant.c

diff --git a/types/variant.c b/types/variant.c
index ba4179de5b8710ea7e778b8ea64d6155c543c4ca..ed2955031786ad3087cdf10fe9f572f404908b31 100644 (file)
--- a/types/variant.c
+++ b/types/variant.c
@@ -32,20 +32,20 @@
 #include <errno.h>
 
 static
-struct definition *_variant_definition_new(struct declaration *declaration,
+struct bt_definition *_variant_definition_new(struct declaration *declaration,
                                struct definition_scope *parent_scope,
                                GQuark field_name, int index,
                                const char *root_name);
 static
-void _variant_definition_free(struct definition *definition);
+void _variant_definition_free(struct bt_definition *definition);
 
-int variant_rw(struct stream_pos *ppos, struct definition *definition)
+int bt_variant_rw(struct bt_stream_pos *ppos, struct bt_definition *definition)
 {
        struct definition_variant *variant_definition =
                container_of(definition, struct definition_variant, p);
-       struct definition *field;
+       struct bt_definition *field;
 
-       field = variant_get_current_field(variant_definition);
+       field = bt_variant_get_current_field(variant_definition);
        return generic_rw(ppos, field);
 }
 
@@ -130,7 +130,7 @@ struct declaration_variant *
  */
 static
 int check_enum_tag(struct definition_variant *variant,
-                  struct definition *enum_tag)
+                  struct bt_definition *enum_tag)
 {
        struct definition_enum *_enum =
                container_of(enum_tag, struct definition_enum, p);
@@ -172,7 +172,7 @@ int check_enum_tag(struct definition_variant *variant,
 
 
 static
-struct definition *
+struct bt_definition *
        _variant_definition_new(struct declaration *declaration,
                                struct definition_scope *parent_scope,
                                GQuark field_name, int index,
@@ -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);
                                              
@@ -216,8 +216,8 @@ struct definition *
                struct declaration_field *declaration_field =
                        &g_array_index(variant_declaration->untagged_variant->fields,
                                       struct declaration_field, i);
-               struct definition **field =
-                       (struct definition **) &g_ptr_array_index(variant->fields, i);
+               struct bt_definition **field =
+                       (struct bt_definition **) &g_ptr_array_index(variant->fields, i);
 
                /*
                 * All child definition are at index 0, because they are
@@ -232,14 +232,14 @@ 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;
 }
 
 static
-void _variant_definition_free(struct definition *definition)
+void _variant_definition_free(struct bt_definition *definition)
 {
        struct definition_variant *variant =
                container_of(definition, struct definition_variant, p);
@@ -247,11 +247,11 @@ void _variant_definition_free(struct definition *definition)
 
        assert(variant->fields->len == variant->declaration->untagged_variant->fields->len);
        for (i = 0; i < variant->fields->len; i++) {
-               struct definition *field = g_ptr_array_index(variant->fields, i);
+               struct bt_definition *field = g_ptr_array_index(variant->fields, i);
                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);
@@ -301,7 +301,7 @@ bt_untagged_variant_declaration_get_field_from_tag(struct declaration_untagged_v
 /*
  * 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 bt_definition *bt_variant_get_current_field(struct definition_variant *variant)
 {
        struct definition_enum *_enum =
                container_of(variant->enum_tag, struct definition_enum, p);