X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Fstruct.c;h=cbfcc7cde2b00ea2a6b6686ad51ada158f56fb33;hp=7dd17e04111db0ee6ccfbcf735746abce9209640;hb=ecc54f11c258cad6b54d35da83e525d32c032397;hpb=fd3382e8659903b36971efb933e5770e802b45d5

diff --git a/formats/ctf-text/types/struct.c b/formats/ctf-text/types/struct.c
index 7dd17e04..cbfcc7cd 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,29 +16,41 @@
  *
  * 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>
 
-int 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 bt_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);
+	uint64_t len = bt_struct_declaration_len(struct_declaration);
 	int field_nr_saved;
 	int ret;
 
+	if (!print_field(definition))
+		return 0;
+
 	if (!pos->dummy) {
 		if (pos->depth >= 0) {
 			if (pos->field_nr++ != 0)
 				fprintf(pos->fp, ",");
-			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));
+					rem_(g_quark_to_string(definition->name)));
 			if (pos->print_names || len > 1)
 				fprintf(pos->fp, "{");
 		}
@@ -44,7 +58,7 @@ int ctf_text_struct_write(struct stream_pos *ppos, struct definition *definition
 	}
 	field_nr_saved = pos->field_nr;
 	pos->field_nr = 0;
-	ret = struct_rw(ppos, definition);
+	ret = bt_struct_rw(ppos, definition);
 	if (!pos->dummy) {
 		pos->depth--;
 		if (pos->depth >= 0 && (pos->print_names || len > 1)) {