X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Fstruct.c;h=9f63c7bd517543683d33efd4ac728c98b4c43f67;hb=764af3f43c289a0a5cd8bf6fd85d9361ae17a253;hp=4270a21afa65bb99e87b6e5d8955c026e6606a56;hpb=c8b219a3168dd382a167a72406e268550005e662;p=babeltrace.git

diff --git a/formats/ctf-text/types/struct.c b/formats/ctf-text/types/struct.c
index 4270a21a..9f63c7bd 100644
--- a/formats/ctf-text/types/struct.c
+++ b/formats/ctf-text/types/struct.c
@@ -19,23 +19,30 @@
 #include <babeltrace/ctf-text/types.h>
 #include <stdio.h>
 
-void ctf_text_struct_write(struct stream_pos *ppos, struct definition *definition)
+int ctf_text_struct_write(struct stream_pos *ppos, struct definition *definition)
 {
 	struct ctf_text_stream_pos *pos = ctf_text_pos(ppos);
+	int ret;
 
 	if (!pos->dummy) {
 		if (pos->depth >= 0) {
-			print_pos_tabs(pos);
-			fprintf(pos->fp, "{\n");
+			if (definition->index != 0 && definition->index != INT_MAX)
+				fprintf(pos->fp, ",");
+			if (definition->index != INT_MAX)
+				fprintf(pos->fp, " ");
+			if (pos->print_names && definition->name != 0)
+				fprintf(pos->fp, "%s = ",
+					g_quark_to_string(definition->name));
+			fprintf(pos->fp, "{");
 		}
 		pos->depth++;
 	}
-	struct_rw(ppos, definition);
+	ret = struct_rw(ppos, definition);
 	if (!pos->dummy) {
 		pos->depth--;
 		if (pos->depth >= 0) {
-			print_pos_tabs(pos);
-			fprintf(pos->fp, "}\n");
+			fprintf(pos->fp, " }");
 		}
 	}
+	return ret;
 }