Remove leading underscores from identifiers directly in lexer

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

diff --git a/formats/ctf-text/types/integer.c b/formats/ctf-text/types/integer.c
index 1337eca3ab13df44bb89e7ee5903d381dd743a88..46803f640c3376ed662883a1a4876ae5a052e3d5 100644 (file)
--- a/formats/ctf-text/types/integer.c
+++ b/formats/ctf-text/types/integer.c
@@ -3,7 +3,9 @@
  *
  * Integers read/write 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
@@ -30,6 +32,9 @@ int ctf_text_integer_write(struct stream_pos *ppos, struct definition *definitio
                integer_definition->declaration;
        struct ctf_text_stream_pos *pos = ctf_text_pos(ppos);
 
+       if (!print_field(definition))
+               return 0;
+
        if (pos->dummy)
                return 0;
 
@@ -40,8 +45,9 @@ int ctf_text_integer_write(struct stream_pos *ppos, struct definition *definitio
                fprintf(pos->fp, "%s = ",
                        g_quark_to_string(definition->name));
 
-       if (integer_declaration->encoding == CTF_STRING_ASCII
-           || integer_declaration->encoding == CTF_STRING_UTF8) {
+       if (pos->string
+           && (integer_declaration->encoding == CTF_STRING_ASCII
+             || integer_declaration->encoding == CTF_STRING_UTF8)) {
 
                if (!integer_declaration->signedness) {
                        g_string_append_c(pos->string,
@@ -91,8 +97,7 @@ int ctf_text_integer_write(struct stream_pos *ppos, struct definition *definitio
                else
                        v = (uint64_t) integer_definition->value._signed;
 
-               fprintf(pos->fp, "0%" PRIo64,
-                       integer_definition->value._unsigned);
+               fprintf(pos->fp, "0%" PRIo64, v);
                break;
        }
        case 16:
@@ -104,8 +109,7 @@ int ctf_text_integer_write(struct stream_pos *ppos, struct definition *definitio
                else
                        v = (uint64_t) integer_definition->value._signed;
 
-               fprintf(pos->fp, "0x%" PRIX64,
-                       integer_definition->value._unsigned);
+               fprintf(pos->fp, "0x%" PRIX64, v);
                break;
        }
        default: