Rename ctf_event to ctf_event_declaration

[babeltrace.git] / formats / ctf-text / types / sequence.c

diff --git a/formats/ctf-text/types/sequence.c b/formats/ctf-text/types/sequence.c
index 70a41dc3bb9a975d39344e59e3b83fc2d1efd83a..3fe5ff170c381e43f7276f9cf063a5588f50e604 100644 (file)
--- 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
@@ -22,25 +24,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) {
-               //print_pos_tabs(pos);
-               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--;
-               //print_pos_tabs(pos);
                fprintf(pos->fp, " ]");
        }
+       pos->field_nr = field_nr_saved;
        return ret;
 }