X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Fvariant.c;h=50d21903ce3dc83aa37dc42619e18737609e8e37;hp=1787fb3e499d5c0921cc218e3dbccacf39d777e3;hb=fd3382e8659903b36971efb933e5770e802b45d5;hpb=764af3f43c289a0a5cd8bf6fd85d9361ae17a253

diff --git a/formats/ctf-text/types/variant.c b/formats/ctf-text/types/variant.c
index 1787fb3e..50d21903 100644
--- a/formats/ctf-text/types/variant.c
+++ b/formats/ctf-text/types/variant.c
@@ -22,14 +22,14 @@
 int ctf_text_variant_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) {
 		if (pos->depth >= 0) {
-			if (definition->index != 0 && definition->index != INT_MAX)
+			if (pos->field_nr++ != 0)
 				fprintf(pos->fp, ",");
-			if (definition->index != INT_MAX)
-				fprintf(pos->fp, " ");
+			fprintf(pos->fp, " ");
 			if (pos->print_names)
 				fprintf(pos->fp, "%s = ",
 					g_quark_to_string(definition->name));
@@ -37,6 +37,8 @@ int ctf_text_variant_write(struct stream_pos *ppos, struct definition *definitio
 		}
 		pos->depth++;
 	}
+	field_nr_saved = pos->field_nr;
+	pos->field_nr = 0;
 	ret = variant_rw(ppos, definition);
 	if (!pos->dummy) {
 		pos->depth--;
@@ -44,5 +46,6 @@ int ctf_text_variant_write(struct stream_pos *ppos, struct definition *definitio
 			fprintf(pos->fp, " }");
 		}
 	}
+	pos->field_nr = field_nr_saved;
 	return ret;
 }