lib: add bt_version_get_name() and bt_version_get_name_description()

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

diff --git a/src/lib/object-pool.c b/src/lib/object-pool.c
index dda8b718f4827a4409190acf5a2626d8c23468a6..b31807434236acc32ccdb4f6733f2aa98c507592 100644 (file)
--- a/src/lib/object-pool.c
+++ b/src/lib/object-pool.c
@@ -35,13 +35,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 +54,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: