Remove underscore prefix from field names (pretty-print)

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

diff --git a/formats/ctf-text/types/struct.c b/formats/ctf-text/types/struct.c
index 7dd17e04111db0ee6ccfbcf735746abce9209640..a10e4da1d9c6b0ee5735112c6cd118762c5374d0 100644 (file)
--- a/formats/ctf-text/types/struct.c
+++ b/formats/ctf-text/types/struct.c
@@ -3,7 +3,9 @@
  *
  * Structure 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
@@ -29,14 +31,18 @@ int ctf_text_struct_write(struct stream_pos *ppos, struct definition *definition
        int field_nr_saved;
        int ret;
 
+       if (!print_field(definition))
+               return 0;
+
        if (!pos->dummy) {
                if (pos->depth >= 0) {
                        if (pos->field_nr++ != 0)
                                fprintf(pos->fp, ",");
-                       fprintf(pos->fp, " ");
+                       if (pos->print_names || len > 1)
+                               fprintf(pos->fp, " ");
                        if (pos->print_names && definition->name != 0)
                                fprintf(pos->fp, "%s = ",
-                                       g_quark_to_string(definition->name));
+                                       rem_(g_quark_to_string(definition->name)));
                        if (pos->print_names || len > 1)
                                fprintf(pos->fp, "{");
                }