X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Farray.c;h=3aaa633143ef48ee997d9239e26eb5e699353120;hp=1b8d6bee261c82a8ae16d8ba5f76a43b60499747;hb=8d8ed9afdf03dc0808e25c0e68279bb31d54742f;hpb=1ae19169d9cb823765444d22cdb05cd2ed3f162f

diff --git a/formats/ctf-text/types/array.c b/formats/ctf-text/types/array.c
index 1b8d6bee..3aaa6331 100644
--- a/formats/ctf-text/types/array.c
+++ b/formats/ctf-text/types/array.c
@@ -3,7 +3,9 @@
  *
  * Array format access functions.
  *
- * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -19,19 +21,59 @@
 #include <babeltrace/ctf-text/types.h>
 #include <stdio.h>
 
-void ctf_text_array_write(struct stream_pos *ppos, struct definition *definition)
+int ctf_text_array_write(struct stream_pos *ppos, struct definition *definition)
 {
 	struct ctf_text_stream_pos *pos = ctf_text_pos(ppos);
+	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 (pos->field_nr++ != 0)
+			fprintf(pos->fp, ",");
+		fprintf(pos->fp, " ");
+		if (pos->print_names)
+			fprintf(pos->fp, "%s = ",
+				rem_(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) {
-		print_pos_tabs(pos);
-		fprintf(pos->fp, "[\n");
+		fprintf(pos->fp, "[");
 		pos->depth++;
 	}
-	array_rw(ppos, definition);
+	field_nr_saved = pos->field_nr;
+	pos->field_nr = 0;
+	ret = array_rw(ppos, definition);
 	if (!pos->dummy) {
 		pos->depth--;
-		print_pos_tabs(pos);
-		fprintf(pos->fp, "]\n");
+		fprintf(pos->fp, " ]");
 	}
+	pos->field_nr = field_nr_saved;
+	return ret;
 }