From: Michael Tremer Date: Sat, 11 Jan 2025 17:31:47 +0000 (+0000) Subject: packagelist: Rename push to add X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf8e88086fc23181a08ad7352656a3e38da84c58;p=people%2Fric9%2Fpakfire.git packagelist: Rename push to add Signed-off-by: Michael Tremer --- diff --git a/src/pakfire/packagelist.c b/src/pakfire/packagelist.c index b8a80833d..2bbc7e954 100644 --- a/src/pakfire/packagelist.c +++ b/src/pakfire/packagelist.c @@ -134,7 +134,7 @@ static int pakfire_packagelist_search(struct pakfire_packagelist* self, struct p return lo; } -int pakfire_packagelist_push(struct pakfire_packagelist* self, struct pakfire_package* pkg) { +int pakfire_packagelist_add(struct pakfire_packagelist* self, struct pakfire_package* pkg) { // Find the index where the package should go int pos = pakfire_packagelist_search(self, pkg); @@ -198,7 +198,7 @@ int pakfire_packagelist_import_solvables(struct pakfire_packagelist* self, if (r) return r; - r = pakfire_packagelist_push(self, pkg); + r = pakfire_packagelist_add(self, pkg); pakfire_package_unref(pkg); if (r) return r; diff --git a/src/pakfire/packagelist.h b/src/pakfire/packagelist.h index 328c3a74f..d8e2f677d 100644 --- a/src/pakfire/packagelist.h +++ b/src/pakfire/packagelist.h @@ -36,7 +36,7 @@ struct pakfire_packagelist* pakfire_packagelist_unref(struct pakfire_packagelist size_t pakfire_packagelist_length(struct pakfire_packagelist* list); struct pakfire_package* pakfire_packagelist_get(struct pakfire_packagelist* list, unsigned int index); -int pakfire_packagelist_push(struct pakfire_packagelist* list, struct pakfire_package* pkg); +int pakfire_packagelist_add(struct pakfire_packagelist* list, struct pakfire_package* pkg); typedef int (*pakfire_packagelist_walk_callback) (struct pakfire_ctx* ctx, struct pakfire_package* pkg, void* p); diff --git a/src/pakfire/repo.c b/src/pakfire/repo.c index e4ecfd413..5403b6af6 100644 --- a/src/pakfire/repo.c +++ b/src/pakfire/repo.c @@ -2121,8 +2121,8 @@ static int pakfire_repo_to_packagelist(struct pakfire_repo* repo, if (r < 0) return r; - // Append the package to the list - r = pakfire_packagelist_push(list, pkg); + // Add the package to the list + r = pakfire_packagelist_add(list, pkg); pakfire_package_unref(pkg); if (r < 0) return r; diff --git a/src/pakfire/transaction.c b/src/pakfire/transaction.c index 3b7a11c74..e7e9d0f79 100644 --- a/src/pakfire/transaction.c +++ b/src/pakfire/transaction.c @@ -228,13 +228,13 @@ static int pakfire_transaction_import_transaction(struct pakfire_transaction* tr goto ERROR; // Add the package to the total list of packages - r = pakfire_packagelist_push(transaction->installed_packages, pkg); + r = pakfire_packagelist_add(transaction->installed_packages, pkg); if (r < 0) goto ERROR; // If the package is being newly installed, we add it to that list, too if (i < new_pkgs) { - r = pakfire_packagelist_push(transaction->new_packages, pkg); + r = pakfire_packagelist_add(transaction->new_packages, pkg); if (r < 0) goto ERROR; }