Fix: lib: pass down API function name to some helpers

[babeltrace.git] / src / lib / object-pool.c

diff --git a/src/lib/object-pool.c b/src/lib/object-pool.c
index dda8b718f4827a4409190acf5a2626d8c23468a6..3b48dee9dd71c1749376c33ae88a9b93bebae5e6 100644 (file)
--- a/src/lib/object-pool.c
+++ b/src/lib/object-pool.c
@@ -1,23 +1,7 @@
 /*
- * Copyright (c) 2018 Philippe Proulx <pproulx@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
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * SPDX-License-Identifier: MIT
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Copyright (c) 2018 Philippe Proulx <pproulx@efficios.com>
  */
 
 #define BT_LOG_TAG "LIB/OBJECT-POOL"
@@ -25,7 +9,7 @@
 
 #include <stdint.h>
 #include "common/assert.h"
-#include "lib/assert-pre.h"
+#include "lib/assert-cond.h"
 #include "lib/object-pool.h"
 
 int bt_object_pool_initialize(struct bt_object_pool *pool,
@@ -35,13 +19,14 @@ int bt_object_pool_initialize(struct bt_object_pool *pool,
 {
        int ret = 0;
 
+       BT_ASSERT(pool);
        BT_ASSERT(new_object_func);
        BT_ASSERT(destroy_object_func);
        BT_LOGD("Initializing object pool: addr=%p, data-addr=%p",
                pool, data);
        pool->objects = g_ptr_array_new();
        if (!pool->objects) {
-               BT_LOGE_STR("Failed to allocate a GPtrArray.");
+               BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GPtrArray.");
                goto error;
        }
 
@@ -53,10 +38,7 @@ int bt_object_pool_initialize(struct bt_object_pool *pool,
        goto end;
 
 error:
-       if (pool) {
-               bt_object_pool_finalize(pool);
-       }
-
+       bt_object_pool_finalize(pool);
        ret = -1;
 
 end: