X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Fsequence.c;h=20345ccee135815dff488a4d719207d1bae225c1;hp=4e9048949fc3f54a3481b8ce2dc6b989c7a85246;hb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0;hpb=d63ca2cd2249356c28a63653d30c681e9a7ce249

diff --git a/formats/ctf-text/types/sequence.c b/formats/ctf-text/types/sequence.c
index 4e904894..20345cce 100644
--- a/formats/ctf-text/types/sequence.c
+++ b/formats/ctf-text/types/sequence.c
@@ -3,7 +3,9 @@
  *
  * Sequence 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
@@ -14,6 +16,14 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #include <babeltrace/ctf-text/types.h>
@@ -22,23 +32,56 @@
 int ctf_text_sequence_write(struct stream_pos *ppos, struct definition *definition)
 {
 	struct ctf_text_stream_pos *pos = ctf_text_pos(ppos);
-	int ret;
+	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 = 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));
+				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 = 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++;
 	}
+	field_nr_saved = pos->field_nr;
+	pos->field_nr = 0;
 	ret = sequence_rw(ppos, definition);
 	if (!pos->dummy) {
 		pos->depth--;
 		fprintf(pos->fp, " ]");
 	}
+	pos->field_nr = field_nr_saved;
 	return ret;
 }