X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Farray.c;h=1ee556a02431bcf3b1796c2a9efeba5f5ff57200;hb=bc7eb6c8e743cd6ae2c653fc957d19dfaf3fc200;hp=aa941b5e9a3dec8c6505d8bd1105b12ed1fac99e;hpb=d63ca2cd2249356c28a63653d30c681e9a7ce249;p=babeltrace.git

diff --git a/formats/ctf-text/types/array.c b/formats/ctf-text/types/array.c
index aa941b5e..1ee556a0 100644
--- a/formats/ctf-text/types/array.c
+++ b/formats/ctf-text/types/array.c
@@ -22,23 +22,56 @@
 int ctf_text_array_write(struct stream_pos *ppos, struct definition *definition)
 {
 	struct ctf_text_stream_pos *pos = ctf_text_pos(ppos);
-	int ret;
+	struct definition_array *array_definition =
+		container_of(definition, struct definition_array, p);
+	struct declaration_array *array_declaration =
+		array_definition->declaration;
+	struct declaration *elem = array_declaration->elem;
+	int field_nr_saved;
+	int ret = 0;
+
+	if (!print_field(definition))
+		return 0;
 
 	if (!pos->dummy) {
-		if (definition->index != 0 && definition->index != INT_MAX)
+		if (pos->field_nr++ != 0)
 			fprintf(pos->fp, ",");
-		if (definition->index != INT_MAX)
-			fprintf(pos->fp, " ");
+		fprintf(pos->fp, " ");
 		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 = array_definition->string;
+				g_string_assign(array_definition->string, "");
+				ret = array_rw(ppos, definition);
+				pos->string = NULL;
+			}
+			fprintf(pos->fp, "\"%s\"", array_definition->string->str);
+			return ret;
+		}
+	}
+
+	if (!pos->dummy) {
 		fprintf(pos->fp, "[");
 		pos->depth++;
 	}
+	field_nr_saved = pos->field_nr;
+	pos->field_nr = 0;
 	ret = array_rw(ppos, definition);
 	if (!pos->dummy) {
 		pos->depth--;
 		fprintf(pos->fp, " ]");
 	}
+	pos->field_nr = field_nr_saved;
 	return ret;
 }