Cleanup: fix cppcheck warnings

[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 9043277d19b07b634cf33c522e0d117e8fcb6e43..11529dd9bb9cf001dc87ecb460199f044bcc0bd8 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
@@ -28,7 +30,7 @@ int ctf_text_enum_write(struct stream_pos *ppos, struct definition *definition)
                enum_definition->integer;
        struct ctf_text_stream_pos *pos = ctf_text_pos(ppos);
        GArray *qs;
-       int i, ret;
+       int ret;
        int field_nr_saved;
 
        if (!print_field(definition))
@@ -42,7 +44,7 @@ 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;
@@ -51,6 +53,8 @@ int ctf_text_enum_write(struct stream_pos *ppos, struct definition *definition)
        qs = enum_definition->value;
 
        if (qs) {
+               int i;
+
                for (i = 0; i < qs->len; i++) {
                        GQuark q = g_array_index(qs, GQuark, i);
                        const char *str = g_quark_to_string(q);