namespace the scope_path functions

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/babeltrace/types.h b/include/babeltrace/types.h
index 00c928b57baf6d97bc0ed8e06e4e4e4ddf11c9b2..772abb2a9197437a620b1db38a28ce0c1d488f0f 100644 (file)
--- a/include/babeltrace/types.h
+++ b/include/babeltrace/types.h
@@ -511,7 +511,7 @@ int sequence_rw(struct stream_pos *pos, struct definition *definition);
 /*
  * in: path (dot separated), out: q (GArray of GQuark)
  */
 /*
  * in: path (dot separated), out: q (GArray of GQuark)
  */

-void append_scope_path(const char *path, GArray *q);
+void bt_append_scope_path(const char *path, GArray *q);

 
 /*
  * Lookup helpers.
 
 /*
  * Lookup helpers.

diff --git a/types/sequence.c b/types/sequence.c
index 0e84b1d18ceb092fe28af8c45ce1eb8a9fcba23c..3967f977a105b6fc815940a6702291f7cb443e98 100644 (file)
--- a/types/sequence.c
+++ b/types/sequence.c
@@ -111,7 +111,7 @@ struct declaration_sequence *
        declaration = &sequence_declaration->p;
 
        sequence_declaration->length_name = g_array_new(FALSE, TRUE, sizeof(GQuark));
        declaration = &sequence_declaration->p;
 
        sequence_declaration->length_name = g_array_new(FALSE, TRUE, sizeof(GQuark));

-       append_scope_path(length, sequence_declaration->length_name);
+       bt_append_scope_path(length, sequence_declaration->length_name);

 
        declaration_ref(elem_declaration);
        sequence_declaration->elem = elem_declaration;
 
        declaration_ref(elem_declaration);
        sequence_declaration->elem = elem_declaration;

diff --git a/types/types.c b/types/types.c
index 139e318ae25cb86ef0cccc2c8049571e60fc8854..9c5cfca3a3941be044abf68e4c4d90a35d560945 100644 (file)
--- a/types/types.c
+++ b/types/types.c
@@ -547,7 +547,7 @@ struct definition_scope *
 
        if (root_name) {
                scope = _new_definition_scope(parent_scope, 0);
 
        if (root_name) {
                scope = _new_definition_scope(parent_scope, 0);

-               append_scope_path(root_name, scope->scope_path);
+               bt_append_scope_path(root_name, scope->scope_path);

        } else {
                int scope_path_len = 1;
 
        } else {
                int scope_path_len = 1;
 


@@ -574,7 +574,7 @@ struct definition_scope *
 /*
  * in: path (dot separated), out: q (GArray of GQuark)
  */
 /*
  * in: path (dot separated), out: q (GArray of GQuark)
  */

-void append_scope_path(const char *path, GArray *q)
+void bt_append_scope_path(const char *path, GArray *q)

 {
        const char *ptrbegin, *ptrend = path;
        GQuark quark;
 {
        const char *ptrbegin, *ptrend = path;
        GQuark quark;

diff --git a/types/variant.c b/types/variant.c
index 55b4b1f058820c0c7089202dc029478d31a0e96b..4f1e524ba608b4f0b3853ae7735fa0c2371f914f 100644 (file)
--- a/types/variant.c
+++ b/types/variant.c
@@ -114,7 +114,7 @@ struct declaration_variant *
        variant_declaration->untagged_variant = untagged_variant;
        declaration_ref(&untagged_variant->p);
        variant_declaration->tag_name = g_array_new(FALSE, TRUE, sizeof(GQuark));
        variant_declaration->untagged_variant = untagged_variant;
        declaration_ref(&untagged_variant->p);
        variant_declaration->tag_name = g_array_new(FALSE, TRUE, sizeof(GQuark));

-       append_scope_path(tag, variant_declaration->tag_name);
+       bt_append_scope_path(tag, variant_declaration->tag_name);

        declaration->id = CTF_TYPE_VARIANT;
        declaration->alignment = 1;
        declaration->declaration_free = _variant_declaration_free;
        declaration->id = CTF_TYPE_VARIANT;
        declaration->alignment = 1;
        declaration->declaration_free = _variant_declaration_free;