From: Michael Tremer Date: Wed, 30 Jun 2021 15:46:41 +0000 (+0000) Subject: package: Rename pakfire_package_identical to *_eq X-Git-Tag: 0.9.28~1149 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d602023105af0ebd54221af7268e2f9b0b9f5e40;p=pakfire.git package: Rename pakfire_package_identical to *_eq Signed-off-by: Michael Tremer --- diff --git a/src/libpakfire/include/pakfire/package.h b/src/libpakfire/include/pakfire/package.h index 8eaf12d3a..53d5aea65 100644 --- a/src/libpakfire/include/pakfire/package.h +++ b/src/libpakfire/include/pakfire/package.h @@ -34,7 +34,7 @@ PakfirePackage pakfire_package_ref(PakfirePackage pkg); PakfirePackage pakfire_package_unref(PakfirePackage pkg); Pakfire pakfire_package_get_pakfire(PakfirePackage pkg); -int pakfire_package_identical(PakfirePackage pkg1, PakfirePackage pkg2); +int pakfire_package_eq(PakfirePackage pkg1, PakfirePackage pkg2); int pakfire_package_cmp(PakfirePackage pkg1, PakfirePackage pkg2); int pakfire_package_evr_cmp(PakfirePackage pkg1, PakfirePackage pkg2); diff --git a/src/libpakfire/libpakfire.sym b/src/libpakfire/libpakfire.sym index 75b9d17ec..27856333b 100644 --- a/src/libpakfire/libpakfire.sym +++ b/src/libpakfire/libpakfire.sym @@ -137,6 +137,7 @@ global: pakfire_package_cmp; pakfire_package_create; pakfire_package_dump; + pakfire_package_eq; pakfire_package_get_arch; pakfire_package_get_build_host; pakfire_package_get_build_id; diff --git a/src/libpakfire/package.c b/src/libpakfire/package.c index 9a59731ce..54ad798f7 100644 --- a/src/libpakfire/package.c +++ b/src/libpakfire/package.c @@ -131,7 +131,7 @@ static Solvable* get_solvable(PakfirePackage pkg) { return pool_id2solvable(pool, pkg->id); } -PAKFIRE_EXPORT int pakfire_package_identical(PakfirePackage pkg1, PakfirePackage pkg2) { +PAKFIRE_EXPORT int pakfire_package_eq(PakfirePackage pkg1, PakfirePackage pkg2) { return pkg1->id == pkg2->id; } diff --git a/src/libpakfire/packagelist.c b/src/libpakfire/packagelist.c index 791683ce8..ecb2e9e0c 100644 --- a/src/libpakfire/packagelist.c +++ b/src/libpakfire/packagelist.c @@ -117,9 +117,7 @@ PAKFIRE_EXPORT PakfirePackage pakfire_packagelist_get(struct pakfire_packagelist static int pakfire_packagelist_has(struct pakfire_packagelist* list, PakfirePackage pkg) { for (unsigned int i = 0; i < list->count; i++) { - PakfirePackage _pkg = list->elements[i]; - - if (pakfire_package_identical(pkg, _pkg)) + if (pakfire_package_eq(pkg, list->elements[i])) return 1; }