projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ctf, ctf-writer: Fix -Wnull-dereference warnings
[babeltrace.git]
/
src
/
plugins
/
ctf
/
common
/
metadata
/
ctf-meta-resolve.c
diff --git
a/src/plugins/ctf/common/metadata/ctf-meta-resolve.c
b/src/plugins/ctf/common/metadata/ctf-meta-resolve.c
index 630f14ed5e780ab11100c346f6df187260fa9d15..42c84df110d9fd7342a815872b129572fcdbfb08 100644
(file)
--- a/
src/plugins/ctf/common/metadata/ctf-meta-resolve.c
+++ b/
src/plugins/ctf/common/metadata/ctf-meta-resolve.c
@@
-181,15
+181,10
@@
size_t field_class_stack_size(field_class_stack *stack)
static
struct field_class_stack_frame *field_class_stack_peek(field_class_stack *stack)
{
static
struct field_class_stack_frame *field_class_stack_peek(field_class_stack *stack)
{
- struct field_class_stack_frame *entry = NULL;
+ BT_ASSERT(stack);
+ BT_ASSERT(!field_class_stack_empty(stack));
- if (!stack || field_class_stack_empty(stack)) {
- goto end;
- }
-
- entry = g_ptr_array_index(stack, stack->len - 1);
-end:
- return entry;
+ return g_ptr_array_index(stack, stack->len - 1);
}
/*
}
/*
@@
-199,16
+194,10
@@
static
struct field_class_stack_frame *field_class_stack_at(field_class_stack *stack,
size_t index)
{
struct field_class_stack_frame *field_class_stack_at(field_class_stack *stack,
size_t index)
{
- struct field_class_stack_frame *entry = NULL;
+ BT_ASSERT(stack);
+ BT_ASSERT(index < stack->len);
- if (!stack || index >= stack->len) {
- goto end;
- }
-
- entry = g_ptr_array_index(stack, index);
-
-end:
- return entry;
+ return g_ptr_array_index(stack, index);
}
/*
}
/*
This page took
0.024197 seconds
and
4
git commands to generate.