Revert "Remove leading underscores from identifiers directly in lexer"

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

diff --git a/formats/ctf-text/types/variant.c b/formats/ctf-text/types/variant.c
index 50d21903ce3dc83aa37dc42619e18737609e8e37..da069c8ac3e9395b9e7ad6b4b612c2447d602daf 100644 (file)
--- a/formats/ctf-text/types/variant.c
+++ b/formats/ctf-text/types/variant.c
@@ -3,7 +3,9 @@
  *
  * Variant format access functions.
  *
- * Copyright 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
@@ -25,6 +27,9 @@ int ctf_text_variant_write(struct stream_pos *ppos, struct definition *definitio
        int field_nr_saved;
        int ret;
 
+       if (!print_field(definition))
+               return 0;
+
        if (!pos->dummy) {
                if (pos->depth >= 0) {
                        if (pos->field_nr++ != 0)
@@ -32,7 +37,7 @@ int ctf_text_variant_write(struct stream_pos *ppos, struct definition *definitio
                        fprintf(pos->fp, " ");
                        if (pos->print_names)
                                fprintf(pos->fp, "%s = ",
-                                       g_quark_to_string(definition->name));
+                                       rem_(g_quark_to_string(definition->name)));
                        fprintf(pos->fp, "{");
                }
                pos->depth++;