X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Fvariant.c;h=a21197aa1b3ad35bdac68c980fe2cf7c4bed0d88;hp=5a9df0aa9c999eee01f3a9b22342ff4b963d02e7;hb=d335f0f72a86c7cdcc18e524c74b82a51ad01b16;hpb=1ae19169d9cb823765444d22cdb05cd2ed3f162f

diff --git a/formats/ctf-text/types/variant.c b/formats/ctf-text/types/variant.c
index 5a9df0aa..a21197aa 100644
--- a/formats/ctf-text/types/variant.c
+++ b/formats/ctf-text/types/variant.c
@@ -19,7 +19,36 @@
 #include <babeltrace/ctf-text/types.h>
 #include <stdio.h>
 
-void ctf_text_variant_write(struct stream_pos *pos, struct definition *definition)
+int ctf_text_variant_write(struct stream_pos *ppos, struct definition *definition)
 {
-	variant_rw(pos, definition);
+	struct ctf_text_stream_pos *pos = ctf_text_pos(ppos);
+	int field_nr_saved;
+	int ret;
+
+	if (!print_field(definition))
+		return 0;
+
+	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;
 }