Fix multi-packet packet-based metadata

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

diff --git a/formats/ctf-text/types/array.c b/formats/ctf-text/types/array.c
index 1b8d6bee261c82a8ae16d8ba5f76a43b60499747..9524ba166ea17b6f4d78497a2cbadcbf62f5a33c 100644 (file)
--- a/formats/ctf-text/types/array.c
+++ b/formats/ctf-text/types/array.c
@@ -19,19 +19,29 @@
 #include <babeltrace/ctf-text/types.h>
 #include <stdio.h>
 
-void ctf_text_array_write(struct stream_pos *ppos, struct definition *definition)
+int ctf_text_array_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++;
        }
-       array_rw(ppos, definition);
+       field_nr_saved = pos->field_nr;
+       pos->field_nr = 0;
+       ret = array_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;
 }