X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Finteger.c;h=a01284583f6ecdd64e83cc2a9d34c31b00bc0a8f;hp=8b2df2c005a2f2e65b826d75dd422c77dac98a2b;hb=164078da31b3612e3618e8e8046a3866cb22f80e;hpb=b7e35badc2eac52e27b802a9078bfb7c8f3b04a7

diff --git a/formats/ctf-text/types/integer.c b/formats/ctf-text/types/integer.c
index 8b2df2c0..a0128458 100644
--- a/formats/ctf-text/types/integer.c
+++ b/formats/ctf-text/types/integer.c
@@ -39,20 +39,41 @@ int ctf_text_integer_write(struct stream_pos *ppos, struct definition *definitio
 		fprintf(pos->fp, "%s = ",
 			g_quark_to_string(definition->name));
 
-	if (!compare_definition_path(definition, g_quark_from_static_string("stream.event.header.timestamp"))) {
-		fprintf(pos->fp, "%" PRIu64,
-			integer_definition->value._unsigned);
-		return 0;
-	}
+	switch (integer_declaration->base) {
+	case 2:
+	{
+		int bitnr;
+		uint64_t v = integer_definition->value._unsigned;
 
-	if (!integer_declaration->signedness) {
-		fprintf(pos->fp, "%" PRIu64" (0x%" PRIX64 ")",
-			integer_definition->value._unsigned,
+		fprintf(pos->fp, "b");
+		for (bitnr = 0; bitnr < integer_declaration->len; bitnr++)
+			v <<= 1;
+		for (; bitnr < sizeof(v) * CHAR_BIT; bitnr++) {
+			fprintf(pos->fp, "%u", ((v & 1ULL) << 63) ? 1 : 0);
+			v <<= 1;
+		}
+		break;
+	}
+	case 8:
+		fprintf(pos->fp, "0%" PRIo64,
+			integer_definition->value._unsigned);
+		break;
+	case 10:
+		if (!integer_declaration->signedness) {
+			fprintf(pos->fp, "%" PRIu64,
+				integer_definition->value._unsigned);
+		} else {
+			fprintf(pos->fp, "%" PRId64,
+				integer_definition->value._signed);
+		}
+		break;
+	case 16:
+		fprintf(pos->fp, "0x%" PRIX64,
 			integer_definition->value._unsigned);
-	} else {
-		fprintf(pos->fp, "%" PRId64" (0x%" PRIX64 ")",
-			integer_definition->value._signed,
-			integer_definition->value._signed);
+		break;
+	default:
+		return -EINVAL;
 	}
+
 	return 0;
 }