From 720d3e6506de682cf47dda0e20a318717d4a193f Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Tue, 17 May 2011 12:33:32 -0400 Subject: [PATCH] Sequence: add missing handling of integer encoding Signed-off-by: Mathieu Desnoyers --- formats/ctf-text/types/integer.c | 5 +++-- formats/ctf-text/types/sequence.c | 27 +++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/formats/ctf-text/types/integer.c b/formats/ctf-text/types/integer.c index 1337eca3..457ea804 100644 --- a/formats/ctf-text/types/integer.c +++ b/formats/ctf-text/types/integer.c @@ -40,8 +40,9 @@ int ctf_text_integer_write(struct stream_pos *ppos, struct definition *definitio fprintf(pos->fp, "%s = ", g_quark_to_string(definition->name)); - if (integer_declaration->encoding == CTF_STRING_ASCII - || integer_declaration->encoding == CTF_STRING_UTF8) { + 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, diff --git a/formats/ctf-text/types/sequence.c b/formats/ctf-text/types/sequence.c index 7b5d3c94..8922fdaf 100644 --- a/formats/ctf-text/types/sequence.c +++ b/formats/ctf-text/types/sequence.c @@ -22,6 +22,11 @@ int ctf_text_sequence_write(struct stream_pos *ppos, struct definition *definition) { struct ctf_text_stream_pos *pos = ctf_text_pos(ppos); + struct definition_sequence *sequence_definition = + container_of(definition, struct definition_sequence, p); + struct declaration_sequence *sequence_declaration = + sequence_definition->declaration; + struct declaration *elem = sequence_declaration->elem; int field_nr_saved; int ret; @@ -32,6 +37,28 @@ int ctf_text_sequence_write(struct stream_pos *ppos, struct definition *definiti if (pos->print_names) fprintf(pos->fp, "%s = ", g_quark_to_string(definition->name)); + } + + if (elem->id == CTF_TYPE_INTEGER) { + struct declaration_integer *integer_declaration = + container_of(elem, struct declaration_integer, p); + + if (integer_declaration->encoding == CTF_STRING_UTF8 + || integer_declaration->encoding == CTF_STRING_ASCII) { + + if (!(integer_declaration->len == CHAR_BIT + && integer_declaration->p.alignment == CHAR_BIT)) { + pos->string = sequence_definition->string; + g_string_assign(sequence_definition->string, ""); + ret = sequence_rw(ppos, definition); + pos->string = NULL; + } + fprintf(pos->fp, "\"%s\"", sequence_definition->string->str); + return ret; + } + } + + if (!pos->dummy) { fprintf(pos->fp, "["); pos->depth++; } -- 2.34.1