ctf, ctf-writer: Fix -Wnull-dereference warnings

[babeltrace.git] / src / ctf-writer / resolve.c

diff --git a/src/ctf-writer/resolve.c b/src/ctf-writer/resolve.c
index bc6ede5fc95d1c782a4f7a60085c89050ffb0a73..4636e1c55348786ec6122624ba5cc94244606980 100644 (file)
--- a/src/ctf-writer/resolve.c
+++ b/src/ctf-writer/resolve.c
@@ -36,9 +36,9 @@
 #include <limits.h>
 #include <stdlib.h>
 
-#include <babeltrace2/ctf-writer/field-types.h>
-#include <babeltrace2/ctf-writer/object.h>
-#include <babeltrace2/ctf-writer/stream-class.h>
+#include <babeltrace2-ctf-writer/field-types.h>
+#include <babeltrace2-ctf-writer/object.h>
+#include <babeltrace2-ctf-writer/stream-class.h>
 #include <babeltrace2/types.h>
 
 #include "common/macros.h"
@@ -201,15 +201,10 @@ size_t type_stack_size(type_stack *stack)
 static
 struct type_stack_frame *type_stack_peek(type_stack *stack)
 {
-       struct type_stack_frame *entry = NULL;
+       BT_ASSERT(stack);
+       BT_ASSERT(!type_stack_empty(stack));
 
-       if (!stack || type_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);
 }
 
 /*
@@ -218,19 +213,12 @@ end:
  * Return value is owned by `stack`.
  */
 static
-struct type_stack_frame *type_stack_at(type_stack *stack,
-               size_t index)
+struct type_stack_frame *type_stack_at(type_stack *stack, size_t index)
 {
-       struct type_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);
 }
 
 /*
@@ -259,7 +247,7 @@ static
 struct bt_ctf_field_type_common *get_type_from_ctx(struct resolve_context *ctx,
                enum bt_ctf_scope scope)
 {
-       BT_ASSERT(scope >= BT_CTF_SCOPE_TRACE_PACKET_HEADER &&
+       BT_ASSERT_DBG(scope >= BT_CTF_SCOPE_TRACE_PACKET_HEADER &&
                scope <= BT_CTF_SCOPE_EVENT_FIELDS);
 
        return ctx->scopes[scope - BT_CTF_SCOPE_TRACE_PACKET_HEADER];
@@ -838,7 +826,7 @@ int get_field_paths_lca_index(struct bt_ctf_field_path *field_path1,
        /*
         * Start from both roots and find the first mismatch.
         */
-       BT_ASSERT(field_path1->root == field_path2->root);
+       BT_ASSERT_DBG(field_path1->root == field_path2->root);
        field_path1_len = field_path1->indexes->len;
        field_path2_len = field_path2->indexes->len;
 
@@ -1222,7 +1210,7 @@ int resolve_root_type(enum bt_ctf_scope root_scope, struct resolve_context *ctx)
 {
        int ret;
 
-       BT_ASSERT(type_stack_size(ctx->type_stack) == 0);
+       BT_ASSERT_DBG(type_stack_size(ctx->type_stack) == 0);
        ctx->root_scope = root_scope;
        ret = resolve_type(get_type_from_ctx(ctx, root_scope), ctx);
        ctx->root_scope = BT_CTF_SCOPE_UNKNOWN;