From: Julien Desfossez <jdesfossez@efficios.com>
Date: Thu, 24 Jan 2013 22:20:38 +0000 (-0500)
Subject: namespace the scope_path functions
X-Git-Tag: v1.1.0~41
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=dd0365d91cfb990cf39c2c9ce50bb73423b6041e

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 00c928b5..772abb2a 100644
--- 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)
  */
-void append_scope_path(const char *path, GArray *q);
+void bt_append_scope_path(const char *path, GArray *q);
 
 /*
  * Lookup helpers.
diff --git a/types/sequence.c b/types/sequence.c
index 0e84b1d1..3967f977 100644
--- 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));
-	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;
diff --git a/types/types.c b/types/types.c
index 139e318a..9c5cfca3 100644
--- 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);
-		append_scope_path(root_name, scope->scope_path);
+		bt_append_scope_path(root_name, scope->scope_path);
 	} else {
 		int scope_path_len = 1;
 
@@ -574,7 +574,7 @@ struct definition_scope *
 /*
  * 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;
diff --git a/types/variant.c b/types/variant.c
index 55b4b1f0..4f1e524b 100644
--- 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));
-	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;