X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=formats%2Fctf-text%2Ftypes%2Finteger.c;h=f25f4540cbc8e67348962e46a06009a657d354fd;hb=312623540c466defab45503fbe0ce7ec79dcce85;hp=6abe9b5e55d2c8d8fe335c83497fe5a0f9c6c316;hpb=1ae19169d9cb823765444d22cdb05cd2ed3f162f;p=babeltrace.git

diff --git a/formats/ctf-text/types/integer.c b/formats/ctf-text/types/integer.c
index 6abe9b5e..f25f4540 100644
--- a/formats/ctf-text/types/integer.c
+++ b/formats/ctf-text/types/integer.c
@@ -21,7 +21,7 @@
 #include <inttypes.h>
 #include <stdint.h>
 
-void ctf_text_integer_write(struct stream_pos *ppos, struct definition *definition)
+int ctf_text_integer_write(struct stream_pos *ppos, struct definition *definition)
 {
 	struct definition_integer *integer_definition =
 		container_of(definition, struct definition_integer, p);
@@ -30,15 +30,36 @@ void ctf_text_integer_write(struct stream_pos *ppos, struct definition *definiti
 	struct ctf_text_stream_pos *pos = ctf_text_pos(ppos);
 
 	if (pos->dummy)
-		return;
-	print_pos_tabs(pos);
+		return 0;
+
+	if (definition->index != 0 && definition->index != INT_MAX)
+		fprintf(pos->fp, ",");
+	if (definition->index != INT_MAX)
+		fprintf(pos->fp, " ");
+	if (pos->print_names)
+		fprintf(pos->fp, "%s = ",
+			g_quark_to_string(definition->name));
+
+	//print_pos_tabs(pos);
+
+	if (!compare_definition_path(definition, g_quark_from_static_string("stream.event.header.timestamp"))) {
+		if (!pos->print_names)
+			fprintf(pos->fp, "[%" PRIu64 "]",
+				integer_definition->value._unsigned);
+		else
+			fprintf(pos->fp, "%" PRIu64,
+				integer_definition->value._unsigned);
+		return 0;
+	}
+
 	if (!integer_declaration->signedness) {
-		fprintf(pos->fp, "%" PRIu64" (%" PRIX64 ")\n",
+		fprintf(pos->fp, "%" PRIu64" (0x%" PRIX64 ")",
 			integer_definition->value._unsigned,
 			integer_definition->value._unsigned);
 	} else {
-		fprintf(pos->fp, "%" PRId64" (%" PRIX64 ")\n",
+		fprintf(pos->fp, "%" PRId64" (0x%" PRIX64 ")",
 			integer_definition->value._signed,
 			integer_definition->value._signed);
 	}
+	return 0;
 }