Rename ctf_event to ctf_event_declaration

[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 30209d6be6c66fbcad295273c947b2d14bfdeefe..f56a753bbb47177b0ab2811600f3669a2b935ce7 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
@@ -41,7 +43,7 @@ int ctf_text_integer_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)));
 
        if (pos->string
            && (integer_declaration->encoding == CTF_STRING_ASCII
@@ -95,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:
@@ -108,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: