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 11e91b02218524b15a21f558c0f7ec311f69f50a..3ffe7e2f1b83d0e92efb5d2796f15406ccaf9b98 100644
(file)
--- a/
types/types.c
+++ b/
types/types.c
@@
-21,7
+21,8
@@
*/
#include <babeltrace/format.h>
*/
#include <babeltrace/format.h>
-#include <babeltrace/babeltrace.h>
+#include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/types.h>
#include <limits.h>
#include <glib.h>
#include <errno.h>
#include <limits.h>
#include <glib.h>
#include <errno.h>
@@
-31,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;
}
@@
-113,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++)
@@
-146,7
+150,7
@@
end:
}
static struct definition_scope *
}
static struct definition_scope *
- get_definition_scope(struct definition *definition)
+ get_definition_scope(
const
struct definition *definition)
{
return definition->scope;
}
{
return definition->scope;
}
@@
-493,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("");
@@
-501,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);
@@
-599,7
+604,7
@@
void free_definition_scope(struct definition_scope *scope)
g_free(scope);
}
g_free(scope);
}
-struct definition *lookup_definition(struct definition *definition,
+struct definition *lookup_definition(
const
struct definition *definition,
const char *field_name)
{
struct definition_scope *scope = get_definition_scope(definition);
const char *field_name)
{
struct definition_scope *scope = get_definition_scope(definition);
@@
-611,7
+616,7
@@
struct definition *lookup_definition(struct definition *definition,
scope);
}
scope);
}
-struct definition_integer *lookup_integer(struct definition *definition,
+struct definition_integer *lookup_integer(
const
struct definition *definition,
const char *field_name,
int signedness)
{
const char *field_name,
int signedness)
{
@@
-629,7
+634,7
@@
struct definition_integer *lookup_integer(struct definition *definition,
return lookup_integer;
}
return lookup_integer;
}
-struct definition_enum *lookup_enum(struct definition *definition,
+struct definition_enum *lookup_enum(
const
struct definition *definition,
const char *field_name,
int signedness)
{
const char *field_name,
int signedness)
{
@@
-647,7
+652,7
@@
struct definition_enum *lookup_enum(struct definition *definition,
return lookup_enum;
}
return lookup_enum;
}
-struct definition *lookup_variant(struct definition *definition,
+struct definition *lookup_variant(
const
struct definition *definition,
const char *field_name)
{
struct definition *lookup;
const char *field_name)
{
struct definition *lookup;
This page took
0.024896 seconds
and
4
git commands to generate.