Namespace the struct mmap_stream

[babeltrace.git] / include / babeltrace / format.h

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index c6faca71d9ada4774e82483e5f527904037a6761..8d4ac4b290a794af51af64006e029c80343015f2 100644 (file)
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -41,45 +41,45 @@ extern "C" {
 typedef int bt_intern_str;
 
 /* forward declaration */
-struct stream_pos;
+struct bt_stream_pos;
 struct bt_context;
 struct bt_trace_handle;
 
 /* Parent trace descriptor */
-struct trace_descriptor {
+struct bt_trace_descriptor {
 };
 
-struct mmap_stream {
+struct bt_mmap_stream {
        int fd;
        struct bt_list_head list;
 };
 
-struct mmap_stream_list {
+struct bt_mmap_stream_list {
        struct bt_list_head head;
 };
 
 struct format {
        bt_intern_str name;
 
-       struct trace_descriptor *(*open_trace)(const char *path, int flags,
-                       void (*packet_seek)(struct stream_pos *pos,
+       struct bt_trace_descriptor *(*open_trace)(const char *path, int flags,
+                       void (*packet_seek)(struct bt_stream_pos *pos,
                                size_t index, int whence),
                        FILE *metadata_fp);
-       struct trace_descriptor *(*open_mmap_trace)(
-                       struct mmap_stream_list *mmap_list,
-                       void (*packet_seek)(struct stream_pos *pos,
+       struct bt_trace_descriptor *(*open_mmap_trace)(
+                       struct bt_mmap_stream_list *mmap_list,
+                       void (*packet_seek)(struct bt_stream_pos *pos,
                                size_t index, int whence),
                        FILE *metadata_fp);
-       int (*close_trace)(struct trace_descriptor *descriptor);
-       void (*set_context)(struct trace_descriptor *descriptor,
+       int (*close_trace)(struct bt_trace_descriptor *descriptor);
+       void (*set_context)(struct bt_trace_descriptor *descriptor,
                        struct bt_context *ctx);
-       void (*set_handle)(struct trace_descriptor *descriptor,
+       void (*set_handle)(struct bt_trace_descriptor *descriptor,
                        struct bt_trace_handle *handle);
-       uint64_t (*timestamp_begin)(struct trace_descriptor *descriptor,
+       uint64_t (*timestamp_begin)(struct bt_trace_descriptor *descriptor,
                        struct bt_trace_handle *handle, enum bt_clock_type type);
-       uint64_t (*timestamp_end)(struct trace_descriptor *descriptor,
+       uint64_t (*timestamp_end)(struct bt_trace_descriptor *descriptor,
                        struct bt_trace_handle *handle, enum bt_clock_type type);
-       int (*convert_index_timestamp)(struct trace_descriptor *descriptor);
+       int (*convert_index_timestamp)(struct bt_trace_descriptor *descriptor);
 };
 
 extern struct format *bt_lookup_format(bt_intern_str qname);