X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Fstruct.c;h=cc36fde9e2f5aff0177db425bd3ba6c5992de815;hb=862434ecc02a49c7ee570bd57647755ecbaf7aa0;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..cc36fde9 100644
--- a/formats/ctf-text/types/struct.c
+++ b/formats/ctf-text/types/struct.c
@@ -19,23 +19,42 @@
 #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 declaration *declaration = definition->declaration;
+	struct declaration_struct *struct_declaration =
+		container_of(declaration, struct declaration_struct, p);
 	struct ctf_text_stream_pos *pos = ctf_text_pos(ppos);
+	uint64_t len = struct_declaration_len(struct_declaration);
+	int field_nr_saved;
+	int ret;
+
+	if (!print_field(definition))
+		return 0;
 
 	if (!pos->dummy) {
 		if (pos->depth >= 0) {
-			print_pos_tabs(pos);
-			fprintf(pos->fp, "{\n");
+			if (pos->field_nr++ != 0)
+				fprintf(pos->fp, ",");
+			if (pos->print_names || len > 1)
+				fprintf(pos->fp, " ");
+			if (pos->print_names && definition->name != 0)
+				fprintf(pos->fp, "%s = ",
+					g_quark_to_string(definition->name));
+			if (pos->print_names || len > 1)
+				fprintf(pos->fp, "{");
 		}
 		pos->depth++;
 	}
-	struct_rw(ppos, definition);
+	field_nr_saved = pos->field_nr;
+	pos->field_nr = 0;
+	ret = struct_rw(ppos, definition);
 	if (!pos->dummy) {
 		pos->depth--;
-		if (pos->depth >= 0) {
-			print_pos_tabs(pos);
-			fprintf(pos->fp, "}\n");
+		if (pos->depth >= 0 && (pos->print_names || len > 1)) {
+			fprintf(pos->fp, " }");
 		}
 	}
+	pos->field_nr = field_nr_saved;
+	return ret;
 }