X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Fstruct.c;h=a2aee3a7bda69073db0b83254321d410043951f9;hb=e5c8b0a6fa916208fc800c3e46378dbd0bd8b0b4;hp=20bc1a7f3f8e872bc1ec72c737e3c6ff57c7c050;hpb=1ae19169d9cb823765444d22cdb05cd2ed3f162f;p=babeltrace.git

diff --git a/formats/ctf-text/types/struct.c b/formats/ctf-text/types/struct.c
index 20bc1a7f..a2aee3a7 100644
--- a/formats/ctf-text/types/struct.c
+++ b/formats/ctf-text/types/struct.c
@@ -3,7 +3,9 @@
  *
  * Structure format access functions.
  *
- * Copyright 2010 - 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,25 +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_struct_write(struct stream_pos *ppos, struct definition *definition)
+int ctf_text_struct_write(struct bt_stream_pos *ppos, struct bt_definition *definition)
 {
-	struct declaration *declaration = definition->declaration;
 	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) {
-		print_pos_tabs(pos);
-		fprintf(pos->fp, "{\n");
+		if (pos->depth >= 0) {
+			if (pos->field_nr++ != 0)
+				fprintf(pos->fp, ",");
+			fprintf(pos->fp, " ");
+			if (pos->print_names && definition->name != 0)
+				fprintf(pos->fp, "%s = ",
+					rem_(g_quark_to_string(definition->name)));
+			fprintf(pos->fp, "{");
+		}
 		pos->depth++;
 	}
-	struct_rw(ppos, definition);
+	field_nr_saved = pos->field_nr;
+	pos->field_nr = 0;
+	ret = bt_struct_rw(ppos, definition);
 	if (!pos->dummy) {
 		pos->depth--;
-		print_pos_tabs(pos);
-		fprintf(pos->fp, "}\n");
+		if (pos->depth >= 0) {
+			fprintf(pos->fp, " }");
+		}
 	}
+	pos->field_nr = field_nr_saved;
+	return ret;
 }