Remove underscore prefix from field names (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 7a9a948d3e5ee0fbe080e79766578fbac2743391..b973d494b195dcd67d65931979b3d28dc06996a7 100644 (file)
--- a/formats/ctf-text/types/enum.c
+++ b/formats/ctf-text/types/enum.c
@@ -3,7 +3,9 @@
  *
  * Enumeration mapping strings (quarks) from/to integers.
  *
- * Copyright 2010, 2011 - 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
@@ -31,6 +33,9 @@ int ctf_text_enum_write(struct stream_pos *ppos, struct definition *definition)
        int i, ret;
        int field_nr_saved;
 
+       if (!print_field(definition))
+               return 0;
+
        if (pos->dummy)
                return 0;
 
@@ -39,29 +44,33 @@ int ctf_text_enum_write(struct stream_pos *ppos, struct definition *definition)
        fprintf(pos->fp, " ");
        if (pos->print_names)
                fprintf(pos->fp, "%s = ",
-                       g_quark_to_string(definition->name));
+                       rem_(g_quark_to_string(definition->name)));
 
        field_nr_saved = pos->field_nr;
        pos->field_nr = 0;
        fprintf(pos->fp, "(");
        pos->depth++;
-       ret = generic_rw(ppos, &integer_definition->p);
-       fprintf(pos->fp, ":");
-
        qs = enum_definition->value;
-       assert(qs);
 
-       pos->field_nr = 0;
-       for (i = 0; i < qs->len; i++) {
-               GQuark q = g_array_index(qs, GQuark, i);
-               const char *str = g_quark_to_string(q);
+       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);
+                       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--;
        fprintf(pos->fp, " )");
        pos->field_nr = field_nr_saved;