From 0860ab483ea602b4ac8f60a7634b54c3923da1e6 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Fri, 6 May 2011 20:21:20 -0400 Subject: [PATCH] Add "text" plugin to list. Signed-off-by: Mathieu Desnoyers --- converter/Makefile.am | 6 ++++-- formats/ctf-text/types/struct.c | 1 - formats/registry.c | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/converter/Makefile.am b/converter/Makefile.am index c7ff134d..3aa7fc3d 100644 --- a/converter/Makefile.am +++ b/converter/Makefile.am @@ -10,7 +10,8 @@ bin_PROGRAMS = babeltrace #libbabeltrace_la_LIBADD = \ # $(top_builddir)/types/libbabeltrace_types.la \ # $(top_builddir)/formats/libbabeltrace_registry.la \ -# $(top_builddir)/formats/ctf/libctf.la +# $(top_builddir)/formats/ctf/libctf.la \ +# $(top_builddir)/formats/ctf-text/libctf-text.la babeltrace_SOURCES = \ babeltrace.c @@ -21,4 +22,5 @@ babeltrace_SOURCES = \ babeltrace_LDADD = \ $(top_builddir)/types/libbabeltrace_types.la \ $(top_builddir)/formats/libbabeltrace_registry.la \ - $(top_builddir)/formats/ctf/libctf.la + $(top_builddir)/formats/ctf/libctf.la \ + $(top_builddir)/formats/ctf-text/libctf-text.la diff --git a/formats/ctf-text/types/struct.c b/formats/ctf-text/types/struct.c index 20bc1a7f..cd63fe99 100644 --- a/formats/ctf-text/types/struct.c +++ b/formats/ctf-text/types/struct.c @@ -21,7 +21,6 @@ void ctf_text_struct_write(struct stream_pos *ppos, struct definition *definition) { - struct declaration *declaration = definition->declaration; struct ctf_text_stream_pos *pos = ctf_text_pos(ppos); if (!pos->dummy) { diff --git a/formats/registry.c b/formats/registry.c index 17bc3bce..a6fd74b2 100644 --- a/formats/registry.c +++ b/formats/registry.c @@ -73,6 +73,8 @@ int bt_register_format(struct format *format) void format_init(void) { + if (init_done) + return; format_registry = g_hash_table_new(g_direct_hash, g_direct_equal); assert(format_registry); init_done = 1; -- 2.34.1