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

diff --git a/formats/ctf-text/types/variant.c b/formats/ctf-text/types/variant.c
index 50d21903..da069c8a 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
@@ -25,6 +27,9 @@ int ctf_text_variant_write(struct stream_pos *ppos, struct definition *definitio
 	int field_nr_saved;
 	int ret;
 
+	if (!print_field(definition))
+		return 0;
+
 	if (!pos->dummy) {
 		if (pos->depth >= 0) {
 			if (pos->field_nr++ != 0)
@@ -32,7 +37,7 @@ int ctf_text_variant_write(struct stream_pos *ppos, struct definition *definitio
 			fprintf(pos->fp, " ");
 			if (pos->print_names)
 				fprintf(pos->fp, "%s = ",
-					g_quark_to_string(definition->name));
+					rem_(g_quark_to_string(definition->name)));
 			fprintf(pos->fp, "{");
 		}
 		pos->depth++;