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

namespace the collection functions

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

diff --git a/include/babeltrace/trace-collection.h b/include/babeltrace/trace-collection.h
index 2ac9ba6a..e65654f8 100644
--- a/include/babeltrace/trace-collection.h
+++ b/include/babeltrace/trace-collection.h
@@ -35,11 +35,11 @@ extern "C" {
 
 struct trace_collection;
 
-void init_trace_collection(struct trace_collection *tc);
-void finalize_trace_collection(struct trace_collection *tc);
-int trace_collection_add(struct trace_collection *tc,
+void bt_init_trace_collection(struct trace_collection *tc);
+void bt_finalize_trace_collection(struct trace_collection *tc);
+int bt_trace_collection_add(struct trace_collection *tc,
 			 struct trace_descriptor *td);
-int trace_collection_remove(struct trace_collection *tc,
+int bt_trace_collection_remove(struct trace_collection *tc,
 			 struct trace_descriptor *td);
 
 #ifdef __cplusplus
diff --git a/lib/context.c b/lib/context.c
index 5516e494..d0674223 100644
--- a/lib/context.c
+++ b/lib/context.c
@@ -60,7 +60,7 @@ struct bt_context *bt_context_create(void)
 
 	ctx->current_iterator = NULL;
 	ctx->tc = g_new0(struct trace_collection, 1);
-	init_trace_collection(ctx->tc);
+	bt_init_trace_collection(ctx->tc);
 
 	return ctx;
 }
@@ -129,7 +129,7 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
 	g_hash_table_insert(ctx->trace_handles,
 		(gpointer) (unsigned long) handle->id,
 		handle);
-	ret = trace_collection_add(ctx->tc, td);
+	ret = bt_trace_collection_add(ctx->tc, td);
 	if (ret != 0)
 		goto error;
 
@@ -167,7 +167,7 @@ int bt_context_remove_trace(struct bt_context *ctx, int handle_id)
 		return -ENOENT;
 
 	/* Remove from containers */
-	trace_collection_remove(ctx->tc, handle->td);
+	bt_trace_collection_remove(ctx->tc, handle->td);
 	/* Close the trace */
 	ret = handle->format->close_trace(handle->td);
 	if (ret) {
@@ -184,7 +184,7 @@ static
 void bt_context_destroy(struct bt_context *ctx)
 {
 	assert(ctx);
-	finalize_trace_collection(ctx->tc);
+	bt_finalize_trace_collection(ctx->tc);
 
 	/*
 	 * Remove all traces. The g_hash_table_destroy will call
diff --git a/lib/trace-collection.c b/lib/trace-collection.c
index 4f1379c5..fc06dcd9 100644
--- a/lib/trace-collection.c
+++ b/lib/trace-collection.c
@@ -155,7 +155,7 @@ static void clock_add(gpointer key, gpointer value, gpointer user_data)
  * correlate this trace with at least one other clock in the trace and
  * convert the index from cycles to real time.
  */
-int trace_collection_add(struct trace_collection *tc,
+int bt_trace_collection_add(struct trace_collection *tc,
 				struct trace_descriptor *td)
 {
 	struct ctf_trace *trace;
@@ -208,7 +208,7 @@ error:
 	return -EPERM;
 }
 
-int trace_collection_remove(struct trace_collection *tc,
+int bt_trace_collection_remove(struct trace_collection *tc,
 			    struct trace_descriptor *td)
 {
 	if (!tc || !td)
@@ -222,7 +222,7 @@ int trace_collection_remove(struct trace_collection *tc,
 
 }
 
-void init_trace_collection(struct trace_collection *tc)
+void bt_init_trace_collection(struct trace_collection *tc)
 {
 	assert(tc);
 	tc->array = g_ptr_array_new();
@@ -234,10 +234,10 @@ void init_trace_collection(struct trace_collection *tc)
 }
 
 /*
- * finalize_trace_collection() closes the opened traces for read
+ * bt_finalize_trace_collection() closes the opened traces for read
  * and free the memory allocated for trace collection
  */
-void finalize_trace_collection(struct trace_collection *tc)
+void bt_finalize_trace_collection(struct trace_collection *tc)
 {
 	assert(tc);
 	g_ptr_array_free(tc->array, TRUE);