From 34861b9ddd0eb8040ac54e51f9352c4d7ff6fead Mon Sep 17 00:00:00 2001
From: Julien Desfossez <julien.desfossez@efficios.com>
Date: Thu, 16 Feb 2012 14:34:21 -0500
Subject: [PATCH] Typedef bt_intern_str

Remove external dependency to glib

Signed-off-by: Julien Desfossez <julien.desfossez@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
 formats/registry.c                      | 4 ++--
 include/babeltrace/babeltrace.h         | 5 +----
 include/babeltrace/callbacks-internal.h | 2 ++
 include/babeltrace/context-internal.h   | 2 ++
 include/babeltrace/format.h             | 7 ++++---
 lib/callbacks.c                         | 2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/formats/registry.c b/formats/registry.c
index 12912561..829ede9d 100644
--- a/formats/registry.c
+++ b/formats/registry.c
@@ -40,12 +40,12 @@ void __attribute__((destructor)) format_finalize(void);
  */
 GHashTable *format_registry;
 
-struct format *bt_lookup_format(GQuark qname)
+struct format *bt_lookup_format(bt_intern_str name)
 {
 	if (!init_done)
 		return NULL;
 	return g_hash_table_lookup(format_registry,
-				   (gconstpointer) (unsigned long) qname);
+				   (gconstpointer) (unsigned long) name);
 }
 
 static void show_format(gpointer key, gpointer value, gpointer user_data)
diff --git a/include/babeltrace/babeltrace.h b/include/babeltrace/babeltrace.h
index 8fe9a9c6..4d94a562 100644
--- a/include/babeltrace/babeltrace.h
+++ b/include/babeltrace/babeltrace.h
@@ -17,7 +17,6 @@
  * all copies or substantial portions of the Software.
  */
 
-#include <glib.h>
 #include <babeltrace/context.h>
 #include <babeltrace/format.h>
 #include <babeltrace/iterator.h>
@@ -25,8 +24,6 @@
 #include <babeltrace/trace-handle.h>
 #include <babeltrace/ctf/events.h>
 
-typedef GQuark bt_event_name;
-
 /* Forward declarations */
 struct bt_iter;
 struct ctf_stream_event;
@@ -92,7 +89,7 @@ void babeltrace_dependencies_destroy(struct bt_dependencies *dep);
  * callbacks/read/add more callbacks/read some more.)
  */
 int bt_iter_add_callback(struct bt_iter *iter,
-		bt_event_name event, void *private_data, int flags,
+		bt_intern_str event, void *private_data, int flags,
 		enum bt_cb_ret (*callback)(struct bt_ctf_data *ctf_data,
 					   void *caller_data),
 		struct bt_dependencies *depends,
diff --git a/include/babeltrace/callbacks-internal.h b/include/babeltrace/callbacks-internal.h
index 65f62adb..c9aeccdf 100644
--- a/include/babeltrace/callbacks-internal.h
+++ b/include/babeltrace/callbacks-internal.h
@@ -21,6 +21,8 @@
  * all copies or substantial portions of the Software.
  */
 
+#include <glib.h>
+
 struct bt_callback {
 	int prio;		/* Callback order priority. Lower first. Dynamically assigned from dependency graph. */
 	void *private_data;
diff --git a/include/babeltrace/context-internal.h b/include/babeltrace/context-internal.h
index 475b2d89..80ca42c8 100644
--- a/include/babeltrace/context-internal.h
+++ b/include/babeltrace/context-internal.h
@@ -23,6 +23,8 @@
  * included in all copies or substantial portions of the Software.
  */
 
+#include <glib.h>
+
 struct trace_collection;
 struct GHashTable;
 
diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index 4eb59858..f680dfa7 100644
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -24,7 +24,8 @@
 #include <babeltrace/list.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <glib.h>
+
+typedef int bt_intern_str;
 
 /* forward declaration */
 struct ctf_stream_pos;
@@ -43,7 +44,7 @@ struct mmap_stream_list {
 };
 
 struct format {
-	GQuark name;
+	bt_intern_str name;
 
 	struct trace_descriptor *(*open_trace)(const char *path, int flags,
 			void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
@@ -55,7 +56,7 @@ struct format {
 	void (*close_trace)(struct trace_descriptor *descriptor);
 };
 
-extern struct format *bt_lookup_format(GQuark qname);
+extern struct format *bt_lookup_format(bt_intern_str qname);
 extern void bt_fprintf_format_list(FILE *fp);
 extern int bt_register_format(struct format *format);
 
diff --git a/lib/callbacks.c b/lib/callbacks.c
index f5c4d105..591f5109 100644
--- a/lib/callbacks.c
+++ b/lib/callbacks.c
@@ -61,7 +61,7 @@ struct bt_dependencies *babeltrace_dependencies_create(const char *first, ...)
  * bt_iter_add_callback: Add a callback to iterator.
  */
 int bt_iter_add_callback(struct bt_iter *iter,
-		bt_event_name event, void *private_data, int flags,
+		bt_intern_str event, void *private_data, int flags,
 		enum bt_cb_ret (*callback)(struct bt_ctf_data *ctf_data,
 					   void *private_data),
 		struct bt_dependencies *depends,
-- 
2.34.1