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

diff --git a/formats/ctf-text/types/variant.c b/formats/ctf-text/types/variant.c
index 5a9df0aa..e7e50ace 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
@@ -14,12 +16,49 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #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 = ",
+					rem_(g_quark_to_string(definition->name)));
+			fprintf(pos->fp, "{");
+		}
+		pos->depth++;
+	}
+	field_nr_saved = pos->field_nr;
+	pos->field_nr = 0;
+	ret = bt_variant_rw(ppos, definition);
+	if (!pos->dummy) {
+		pos->depth--;
+		if (pos->depth >= 0) {
+			fprintf(pos->fp, " }");
+		}
+	}
+	pos->field_nr = field_nr_saved;
+	return ret;
 }