projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: fix cppcheck warnings
[babeltrace.git]
/
types
/
types.c
diff --git
a/types/types.c
b/types/types.c
index 450c93ba6b5206c9edcdd8fb726e92c0b029d73a..3ffe7e2f1b83d0e92efb5d2796f15406ccaf9b98 100644
(file)
--- a/
types/types.c
+++ b/
types/types.c
@@
-32,10
+32,13
@@
GQuark prefix_quark(const char *prefix, GQuark quark)
{
GQuark nq;
GString *str;
{
GQuark nq;
GString *str;
+ char *quark_str;
str = g_string_new(prefix);
g_string_append(str, g_quark_to_string(quark));
str = g_string_new(prefix);
g_string_append(str, g_quark_to_string(quark));
- nq = g_quark_from_string(g_string_free(str, FALSE));
+ quark_str = g_string_free(str, FALSE);
+ nq = g_quark_from_string(quark_str);
+ g_free(quark_str);
return nq;
}
return nq;
}
@@
-114,10
+117,10
@@
static int compare_paths(GArray *a, GArray *b, int len)
static int is_path_child_of(GArray *path, GArray *maybe_parent)
{
static int is_path_child_of(GArray *path, GArray *maybe_parent)
{
- int
i,
ret;
+ int ret;
if (babeltrace_debug) {
if (babeltrace_debug) {
- int need_dot = 0;
+ int
i,
need_dot = 0;
printf_debug("Is path \"");
for (i = 0; i < path->len; need_dot = 1, i++)
printf_debug("Is path \"");
for (i = 0; i < path->len; need_dot = 1, i++)
@@
-494,7
+497,6
@@
GQuark new_definition_path(struct definition_scope *parent_scope,
GQuark path;
GString *str;
gchar *c_str;
GQuark path;
GString *str;
gchar *c_str;
- int i;
int need_dot = 0;
str = g_string_new("");
int need_dot = 0;
str = g_string_new("");
@@
-502,6
+504,8
@@
GQuark new_definition_path(struct definition_scope *parent_scope,
g_string_append(str, root_name);
need_dot = 1;
} else if (parent_scope) {
g_string_append(str, root_name);
need_dot = 1;
} else if (parent_scope) {
+ int i;
+
for (i = 0; i < parent_scope->scope_path->len; i++) {
GQuark q = g_array_index(parent_scope->scope_path,
GQuark, i);
for (i = 0; i < parent_scope->scope_path->len; i++) {
GQuark q = g_array_index(parent_scope->scope_path,
GQuark, i);
This page took
0.026656 seconds
and
4
git commands to generate.