Move definitions to per-file structure

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

diff --git a/formats/ctf-text/types/variant.c b/formats/ctf-text/types/variant.c
index b4b72e16afeadb33420ec4998416dd8512402a34..50d21903ce3dc83aa37dc42619e18737609e8e37 100644 (file)
--- a/formats/ctf-text/types/variant.c
+++ b/formats/ctf-text/types/variant.c
@@ -19,7 +19,33 @@
 #include <babeltrace/ctf-text/types.h>
 #include <stdio.h>
 
-int ctf_text_variant_write(struct stream_pos *pos, struct definition *definition)
+int ctf_text_variant_write(struct stream_pos *ppos, struct definition *definition)
 {
-       return variant_rw(pos, definition);
+       struct ctf_text_stream_pos *pos = ctf_text_pos(ppos);
+       int field_nr_saved;
+       int ret;
+
+       if (!pos->dummy) {
+               if (pos->depth >= 0) {
+                       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++;
+       }
+       field_nr_saved = pos->field_nr;
+       pos->field_nr = 0;
+       ret = variant_rw(ppos, definition);
+       if (!pos->dummy) {
+               pos->depth--;
+               if (pos->depth >= 0) {
+                       fprintf(pos->fp, " }");
+               }
+       }
+       pos->field_nr = field_nr_saved;
+       return ret;
 }