X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fformat.h;h=f680dfa7ceb4e76aec8d4ecb380a09e8947b6174;hp=93d1e25146495920c40537b942d556b54541391c;hb=34861b9ddd0eb8040ac54e51f9352c4d7ff6fead;hpb=95d36295f18e15c7f68a97fbab3eb1961d21cd70

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index 93d1e251..f680dfa7 100644
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -21,10 +21,11 @@
  * all copies or substantial portions of the Software.
  */
 
-#include <babeltrace/types.h>
+#include <babeltrace/list.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <glib.h>
+
+typedef int bt_intern_str;
 
 /* forward declaration */
 struct ctf_stream_pos;
@@ -35,18 +36,17 @@ struct trace_descriptor {
 
 struct mmap_stream {
 	int fd;
-	struct cds_list_head list;
+	struct bt_list_head list;
 };
 
 struct mmap_stream_list {
-	struct cds_list_head head;
+	struct bt_list_head head;
 };
 
 struct format {
-	GQuark name;
+	bt_intern_str name;
 
-	struct trace_descriptor *(*open_trace)(const char *collection_path,
-			const char *path, int flags,
+	struct trace_descriptor *(*open_trace)(const char *path, int flags,
 			void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
 				int whence), FILE *metadata_fp);
 	struct trace_descriptor *(*open_mmap_trace)(
@@ -56,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);