Sequence: add missing handling of integer encoding

[babeltrace.git] / formats / ctf-text / types / integer.c

diff --git a/formats/ctf-text/types/integer.c b/formats/ctf-text/types/integer.c
index 34a899ddd0e901dab98141133f71c1c2526e92c2..457ea804e5133ca1e32488e857b2ad6b0369da9e 100644 (file)
--- a/formats/ctf-text/types/integer.c
+++ b/formats/ctf-text/types/integer.c
@@ -40,6 +40,20 @@ int ctf_text_integer_write(struct stream_pos *ppos, struct definition *definitio
                fprintf(pos->fp, "%s = ",
                        g_quark_to_string(definition->name));
 
+       if (pos->string
+           && (integer_declaration->encoding == CTF_STRING_ASCII
+             || integer_declaration->encoding == CTF_STRING_UTF8)) {
+
+               if (!integer_declaration->signedness) {
+                       g_string_append_c(pos->string,
+                               (int) integer_definition->value._unsigned);
+               } else {
+                       g_string_append_c(pos->string,
+                               (int) integer_definition->value._signed);
+               }
+               return 0;
+       }
+
        switch (integer_declaration->base) {
        case 0: /* default */
        case 10:
@@ -61,7 +75,7 @@ int ctf_text_integer_write(struct stream_pos *ppos, struct definition *definitio
                else
                        v = (uint64_t) integer_definition->value._signed;
 
-               fprintf(pos->fp, "b");
+               fprintf(pos->fp, "0b");
                v = _bt_piecewise_lshift(v, 64 - integer_declaration->len);
                for (bitnr = 0; bitnr < integer_declaration->len; bitnr++) {
                        fprintf(pos->fp, "%u", (v & (1ULL << 63)) ? 1 : 0);