X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Fstruct.c;h=8a9344eb01dd765fd3d1b4a07e32f4656141c130;hb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0;hp=e8ffddc2bc362472ea3a4503e7e5d0fb5ef77552;hpb=312623540c466defab45503fbe0ce7ec79dcce85;p=babeltrace.git

diff --git a/formats/ctf-text/types/struct.c b/formats/ctf-text/types/struct.c
index e8ffddc2..8a9344eb 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,6 +16,14 @@
  *
  * 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>
@@ -21,30 +31,40 @@
 
 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);
-			if (definition->index != 0 && definition->index != INT_MAX)
+			if (pos->field_nr++ != 0)
 				fprintf(pos->fp, ",");
-			if (definition->index != INT_MAX)
+			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));
-			fprintf(pos->fp, "{");
+					rem_(g_quark_to_string(definition->name)));
+			if (pos->print_names || len > 1)
+				fprintf(pos->fp, "{");
 		}
 		pos->depth++;
 	}
+	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);
+		if (pos->depth >= 0 && (pos->print_names || len > 1)) {
 			fprintf(pos->fp, " }");
 		}
 	}
+	pos->field_nr = field_nr_saved;
 	return ret;
 }