X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Fsequence.c;h=8922fdaf06e31400d27a0dc8e93c86f2a1d5863a;hp=7b5d3c946a7ff514d44c66acbb10de15317a49b1;hb=720d3e6506de682cf47dda0e20a318717d4a193f;hpb=fd3382e8659903b36971efb933e5770e802b45d5 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++; }