This struct is exposed in the public API, we need to namespace it.
Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
static GPtrArray *opt_input_paths;
static char *opt_output_path;
-static struct format *fmt_read;
+static struct bt_format *fmt_read;
static
void strlower(char *str)
int main(int argc, char **argv)
{
int ret, partial_error = 0, open_success = 0;
- struct format *fmt_write;
+ struct bt_format *fmt_write;
struct bt_trace_descriptor *td_write;
struct bt_context *ctx;
int i;
}
static
-struct format bt_dummy_format = {
+struct bt_format bt_dummy_format = {
.open_trace = bt_dummy_open_trace,
.close_trace = bt_dummy_close_trace,
};
};
static
-struct format ctf_text_format = {
+struct bt_format ctf_text_format = {
.open_trace = ctf_text_open_trace,
.close_trace = ctf_text_close_trace,
};
};
static
-struct format ctf_format = {
+struct bt_format ctf_format = {
.open_trace = ctf_open_trace,
.open_mmap_trace = ctf_open_mmap_trace,
.close_trace = ctf_close_trace,
struct bt_list_head head;
};
-struct format {
+struct bt_format {
bt_intern_str name;
struct bt_trace_descriptor *(*open_trace)(const char *path, int flags,
int (*convert_index_timestamp)(struct bt_trace_descriptor *descriptor);
};
-extern struct format *bt_lookup_format(bt_intern_str qname);
+extern struct bt_format *bt_lookup_format(bt_intern_str qname);
extern void bt_fprintf_format_list(FILE *fp);
-extern int bt_register_format(struct format *format);
-extern void bt_unregister_format(struct format *format);
+extern int bt_register_format(struct bt_format *format);
+extern void bt_unregister_format(struct bt_format *format);
#ifdef __cplusplus
}
struct bt_trace_handle {
int id;
struct bt_trace_descriptor *td;
- struct format *format;
+ struct bt_format *format;
char path[PATH_MAX];
uint64_t real_timestamp_begin;
uint64_t real_timestamp_end;
struct ctf_stream_definition;
struct bt_stream_pos;
-struct format;
+struct bt_format;
struct definition;
struct ctf_clock;
FILE *metadata)
{
struct bt_trace_descriptor *td;
- struct format *fmt;
+ struct bt_format *fmt;
struct bt_trace_handle *handle;
int ret, closeret;
format_cleanup();
}
-struct format *bt_lookup_format(bt_intern_str name)
+struct bt_format *bt_lookup_format(bt_intern_str name)
{
if (!init_done)
return NULL;
fprintf(fp, ".\n");
}
-int bt_register_format(struct format *format)
+int bt_register_format(struct bt_format *format)
{
if (!format)
return -EINVAL;
return 0;
}
-void bt_unregister_format(struct format *format)
+void bt_unregister_format(struct bt_format *format)
{
assert(bt_lookup_format(format->name));
g_hash_table_remove(format_registry,