X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Fvariant.c;h=871b8d58a8435af3badad90cface116bbae73a93;hp=e6abd499db9dcc0503468c60dc38f7dfd9a6d284;hb=f071e095a2a8f76dd78becfa103b952af68e148d;hpb=312623540c466defab45503fbe0ce7ec79dcce85

diff --git a/formats/ctf-text/types/variant.c b/formats/ctf-text/types/variant.c
index e6abd499..871b8d58 100644
--- a/formats/ctf-text/types/variant.c
+++ b/formats/ctf-text/types/variant.c
@@ -3,7 +3,9 @@
  *
  * Variant format access functions.
  *
- * Copyright 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,15 +24,17 @@
 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 (!print_field(definition))
+		return 0;
+
 	if (!pos->dummy) {
 		if (pos->depth >= 0) {
-			//print_pos_tabs(pos);
-			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));
@@ -38,13 +42,15 @@ 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--;
 		if (pos->depth >= 0) {
-			//print_pos_tabs(pos);
 			fprintf(pos->fp, " }");
 		}
 	}
+	pos->field_nr = field_nr_saved;
 	return ret;
 }