Add base integer attribute, and use it in ctf-text

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

diff --git a/formats/ctf-text/types/sequence.c b/formats/ctf-text/types/sequence.c
index a0f8260c4777dc6962513cc304de476780ed676a..7b5d3c946a7ff514d44c66acbb10de15317a49b1 100644 (file)
--- a/formats/ctf-text/types/sequence.c
+++ b/formats/ctf-text/types/sequence.c
@@ -19,19 +19,29 @@
 #include <babeltrace/ctf-text/types.h>
 #include <stdio.h>
 
-void ctf_text_sequence_write(struct stream_pos *ppos, struct definition *definition)
+int ctf_text_sequence_write(struct stream_pos *ppos, struct definition *definition)
 {
        struct ctf_text_stream_pos *pos = ctf_text_pos(ppos);
+       int field_nr_saved;
+       int ret;
 
        if (!pos->dummy) {
-               print_pos_tabs(pos);
-               fprintf(pos->fp, "[\n");
+               if (pos->field_nr++ != 0)
+                       fprintf(pos->fp, ",");
+               fprintf(pos->fp, " ");
+               if (pos->print_names)
+                       fprintf(pos->fp, "%s = ",
+                               g_quark_to_string(definition->name));
+               fprintf(pos->fp, "[");
                pos->depth++;
        }
-       sequence_rw(ppos, definition);
+       field_nr_saved = pos->field_nr;
+       pos->field_nr = 0;
+       ret = sequence_rw(ppos, definition);
        if (!pos->dummy) {
                pos->depth--;
-               print_pos_tabs(pos);
-               fprintf(pos->fp, "]\n");
+               fprintf(pos->fp, " ]");
        }
+       pos->field_nr = field_nr_saved;
+       return ret;
 }