Update pretty-print

[babeltrace.git] / formats / ctf-text / types / struct.c

diff --git a/formats/ctf-text/types/struct.c b/formats/ctf-text/types/struct.c
index cd63fe99551cbaaf4f45d210f10772011856cc2f..e8ffddc2bc362472ea3a4503e7e5d0fb5ef77552 100644 (file)
--- a/formats/ctf-text/types/struct.c
+++ b/formats/ctf-text/types/struct.c
@@ -19,19 +19,32 @@
 #include <babeltrace/ctf-text/types.h>
 #include <stdio.h>
 
-void ctf_text_struct_write(struct stream_pos *ppos, struct definition *definition)
+int ctf_text_struct_write(struct stream_pos *ppos, struct definition *definition)
 {
        struct ctf_text_stream_pos *pos = ctf_text_pos(ppos);
+       int ret;
 
        if (!pos->dummy) {
-               print_pos_tabs(pos);
-               fprintf(pos->fp, "{\n");
+               if (pos->depth >= 0) {
+                       //print_pos_tabs(pos);
+                       if (definition->index != 0 && definition->index != INT_MAX)
+                               fprintf(pos->fp, ",");
+                       if (definition->index != INT_MAX)
+                               fprintf(pos->fp, " ");
+                       if (pos->print_names && definition->name != 0)
+                               fprintf(pos->fp, "%s = ",
+                                       g_quark_to_string(definition->name));
+                       fprintf(pos->fp, "{");
+               }
                pos->depth++;
        }
-       struct_rw(ppos, definition);
+       ret = struct_rw(ppos, definition);
        if (!pos->dummy) {
                pos->depth--;
-               print_pos_tabs(pos);
-               fprintf(pos->fp, "}\n");
+               if (pos->depth >= 0) {
+                       //print_pos_tabs(pos);
+                       fprintf(pos->fp, " }");
+               }
        }
+       return ret;
 }