Add "text" plugin to list.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/converter/Makefile.am b/converter/Makefile.am
index c7ff134d8abec6112c23bcaccffefe24c1aa5403..3aa7fc3d5a4efa24b11700929c88375056a2cbd4 100644 (file)
--- 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 20bc1a7f3f8e872bc1ec72c737e3c6ff57c7c050..cd63fe99551cbaaf4f45d210f10772011856cc2f 100644 (file)
--- 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 17bc3bce7d36a3d68a9975ee5ac4b7d5c006b0e5..a6fd74b2bc5d3432ba0dae10eb0784753607e411 100644 (file)
--- 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;