From: Michael Tremer Date: Fri, 23 Apr 2021 14:46:59 +0000 (+0000) Subject: request: Drop unused functions X-Git-Tag: 0.9.28~1285^2~246 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc1069855cb256217c89dc9b18bb4b4bd7c1b0fc;p=pakfire.git request: Drop unused functions Signed-off-by: Michael Tremer --- diff --git a/src/libpakfire/include/pakfire/request.h b/src/libpakfire/include/pakfire/request.h index 9185c2d0f..1e19954d3 100644 --- a/src/libpakfire/include/pakfire/request.h +++ b/src/libpakfire/include/pakfire/request.h @@ -50,26 +50,18 @@ PakfireTransaction pakfire_request_get_transaction(struct pakfire_request* reque int pakfire_request_install(struct pakfire_request* request, const char* what); int pakfire_request_install_package(struct pakfire_request* request, PakfirePackage package); -int pakfire_request_install_relation(struct pakfire_request* request, PakfireRelation relation); -int pakfire_request_install_selector(struct pakfire_request* request, PakfireSelector selector); int pakfire_request_erase(struct pakfire_request* request, const char* what, int flags); int pakfire_request_erase_package(struct pakfire_request* request, PakfirePackage package, int flags); -int pakfire_request_erase_relation(struct pakfire_request* request, PakfireRelation relation, int flags); -int pakfire_request_erase_selector(struct pakfire_request* request, PakfireSelector selector, int flags); int pakfire_request_upgrade(struct pakfire_request* request, const char* what); int pakfire_request_upgrade_package(struct pakfire_request* request, PakfirePackage package); -int pakfire_request_upgrade_relation(struct pakfire_request* request, PakfireRelation relation); -int pakfire_request_upgrade_selector(struct pakfire_request* request, PakfireSelector selector); int pakfire_request_upgrade_all(struct pakfire_request* request); int pakfire_request_distupgrade(struct pakfire_request* request); - int pakfire_request_lock(struct pakfire_request* request, const char* what); +int pakfire_request_lock(struct pakfire_request* request, const char* what); int pakfire_request_lock_package(struct pakfire_request* request, PakfirePackage package); -int pakfire_request_lock_relation(struct pakfire_request* request, PakfireRelation relation); -int pakfire_request_lock_selector(struct pakfire_request* request, PakfireSelector selector); int pakfire_request_verify(struct pakfire_request* request); diff --git a/src/libpakfire/libpakfire.sym b/src/libpakfire/libpakfire.sym index e7e38f4a8..579353349 100644 --- a/src/libpakfire/libpakfire.sym +++ b/src/libpakfire/libpakfire.sym @@ -375,25 +375,18 @@ global: pakfire_request_distupgrade; pakfire_request_erase; pakfire_request_erase_package; - pakfire_request_erase_relation; - pakfire_request_erase_selector; pakfire_request_get_pool; pakfire_request_get_problems; pakfire_request_get_transaction; pakfire_request_install; pakfire_request_install_package; - pakfire_request_install_relation; - pakfire_request_install_selector; pakfire_request_lock; - pakfire_request_lock_relation; - pakfire_request_lock_selector; + pakfire_request_lock_package; pakfire_request_ref; pakfire_request_solve; pakfire_request_upgrade; pakfire_request_upgrade_all; pakfire_request_upgrade_package; - pakfire_request_upgrade_relation; - pakfire_request_upgrade_selector; pakfire_request_unref; pakfire_request_verify; diff --git a/src/libpakfire/request.c b/src/libpakfire/request.c index 0d70d91b2..af548c223 100644 --- a/src/libpakfire/request.c +++ b/src/libpakfire/request.c @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include @@ -313,14 +312,6 @@ PAKFIRE_EXPORT int pakfire_request_install_package( return pakfire_request_add_package(request, SOLVER_INSTALL, package, 0); } -PAKFIRE_EXPORT int pakfire_request_install_relation(struct pakfire_request* request, PakfireRelation relation) { - return pakfire_relation2queue(relation, &request->jobs, SOLVER_INSTALL); -} - -PAKFIRE_EXPORT int pakfire_request_install_selector(struct pakfire_request* request, PakfireSelector selector) { - return pakfire_selector2queue(selector, &request->jobs, SOLVER_INSTALL); -} - static int erase_flags(int flags) { int additional = 0; @@ -339,18 +330,6 @@ PAKFIRE_EXPORT int pakfire_request_erase_package( return pakfire_request_add_package(request, SOLVER_ERASE, package, erase_flags(flags)); } -PAKFIRE_EXPORT int pakfire_request_erase_relation(struct pakfire_request* request, PakfireRelation relation, int flags) { - int additional = erase_flags(flags); - - return pakfire_relation2queue(relation, &request->jobs, SOLVER_ERASE|additional); -} - -PAKFIRE_EXPORT int pakfire_request_erase_selector(struct pakfire_request* request, PakfireSelector selector, int flags) { - int additional = erase_flags(flags); - - return pakfire_selector2queue(selector, &request->jobs, SOLVER_ERASE|additional); -} - PAKFIRE_EXPORT int pakfire_request_upgrade(struct pakfire_request* request, const char* what) { return pakfire_request_add_job(request, SOLVER_UPDATE, what, 0); } @@ -360,14 +339,6 @@ PAKFIRE_EXPORT int pakfire_request_upgrade_package( return pakfire_request_add_package(request, SOLVER_UPDATE, package, 0); } -PAKFIRE_EXPORT int pakfire_request_upgrade_relation(struct pakfire_request* request, PakfireRelation relation) { - return pakfire_relation2queue(relation, &request->jobs, SOLVER_UPDATE); -} - -PAKFIRE_EXPORT int pakfire_request_upgrade_selector(struct pakfire_request* request, PakfireSelector selector) { - return pakfire_selector2queue(selector, &request->jobs, SOLVER_UPDATE); -} - PAKFIRE_EXPORT int pakfire_request_upgrade_all(struct pakfire_request* request) { queue_push2(&request->jobs, SOLVER_SOLVABLE_ALL|SOLVER_UPDATE, 0); @@ -388,14 +359,6 @@ PAKFIRE_EXPORT int pakfire_request_lock_package(struct pakfire_request* request, return pakfire_request_add_package(request, SOLVER_LOCK, package, 0); } -PAKFIRE_EXPORT int pakfire_request_lock_relation(struct pakfire_request* request, PakfireRelation relation) { - return pakfire_relation2queue(relation, &request->jobs, SOLVER_LOCK); -} - -PAKFIRE_EXPORT int pakfire_request_lock_selector(struct pakfire_request* request, PakfireSelector selector) { - return pakfire_selector2queue(selector, &request->jobs, SOLVER_LOCK); -} - PAKFIRE_EXPORT int pakfire_request_verify(struct pakfire_request* request) { queue_push2(&request->jobs, SOLVER_SOLVABLE_ALL|SOLVER_VERIFY, 0);