Update enum pretty print

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

diff --git a/formats/ctf-text/types/enum.c b/formats/ctf-text/types/enum.c
index 198f7829e7db948890311ebda15c75a0a5054445..4a3eac0feecfb93e7f401b4abbf7bee8ada932ab 100644 (file)
--- a/formats/ctf-text/types/enum.c
+++ b/formats/ctf-text/types/enum.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <stdint.h>
 
-void ctf_text_enum_write(struct stream_pos *ppos, struct definition *definition)
+int ctf_text_enum_write(struct stream_pos *ppos, struct definition *definition)
 {
        struct definition_enum *enum_definition =
                container_of(definition, struct definition_enum, p);
@@ -28,25 +28,46 @@ void ctf_text_enum_write(struct stream_pos *ppos, struct definition *definition)
                enum_definition->integer;
        struct ctf_text_stream_pos *pos = ctf_text_pos(ppos);
        GArray *qs;
-       int i;
+       int i, ret;
+       int field_nr_saved;
 
        if (pos->dummy)
-               return;
-       print_pos_tabs(pos);
+               return 0;
+
+       if (pos->field_nr++ != 0)
+               fprintf(pos->fp, ",");
+       fprintf(pos->fp, " ");
+       if (pos->print_names)
+               fprintf(pos->fp, "%s = ",
+                       g_quark_to_string(definition->name));
+
+       field_nr_saved = pos->field_nr;
+       pos->field_nr = 0;
        fprintf(pos->fp, "(");
        pos->depth++;
-       generic_rw(ppos, &integer_definition->p);
-       print_pos_tabs(pos);
-
        qs = enum_definition->value;
-       assert(qs);
 
-       for (i = 0; i < qs->len; i++) {
-               GQuark q = g_array_index(qs, GQuark, i);
-               const char *str = g_quark_to_string(q);
-               fprintf(pos->fp, "%s\n", str);
+       if (qs) {
+               for (i = 0; i < qs->len; i++) {
+                       GQuark q = g_array_index(qs, GQuark, i);
+                       const char *str = g_quark_to_string(q);
+
+                       assert(str);
+                       if (pos->field_nr++ != 0)
+                               fprintf(pos->fp, ",");
+                       fprintf(pos->fp, " ");
+                       fprintf(pos->fp, "%s", str);
+               }
+       } else {
+               fprintf(pos->fp, " <unknown>");
        }
+
+       pos->field_nr = 0;
+       fprintf(pos->fp, " :");
+       ret = generic_rw(ppos, &integer_definition->p);
+
        pos->depth--;
-       print_pos_tabs(pos);
-       fprintf(pos->fp, ")");
+       fprintf(pos->fp, " )");
+       pos->field_nr = field_nr_saved;
+       return ret;
 }