From b8cd6656487961cef5122478c4d3e96ccfd7f6ff Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 16 Jan 2018 00:36:54 +0100 Subject: [PATCH] libpakfire: Make pakfire_pool_unref the same style as others Signed-off-by: Michael Tremer --- src/libpakfire/include/pakfire/pool.h | 3 ++- src/libpakfire/pool.c | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/libpakfire/include/pakfire/pool.h b/src/libpakfire/include/pakfire/pool.h index 8ba4f2b36..3bae21067 100644 --- a/src/libpakfire/include/pakfire/pool.h +++ b/src/libpakfire/include/pakfire/pool.h @@ -24,8 +24,9 @@ #include PakfirePool pakfire_pool_create(Pakfire pakfire); + PakfirePool pakfire_pool_ref(PakfirePool pool); -void pakfire_pool_unref(PakfirePool pool); +PakfirePool pakfire_pool_unref(PakfirePool pool); int pakfire_pool_version_compare(PakfirePool pool, const char* evr1, const char* evr2); int pakfire_pool_count(PakfirePool pool); diff --git a/src/libpakfire/pool.c b/src/libpakfire/pool.c index 6bbf4f719..a14ce1380 100644 --- a/src/libpakfire/pool.c +++ b/src/libpakfire/pool.c @@ -97,11 +97,15 @@ PAKFIRE_EXPORT PakfirePool pakfire_pool_ref(PakfirePool pool) { return pool; } -PAKFIRE_EXPORT void pakfire_pool_unref(PakfirePool pool) { +PAKFIRE_EXPORT PakfirePool pakfire_pool_unref(PakfirePool pool) { + if (!pool) + return NULL; + if (--pool->nrefs > 0) - return; + return pool; pakfire_pool_free(pool); + return NULL; } Pool* pakfire_pool_get_solv_pool(PakfirePool pool) { -- 2.39.5