From a693a077946b423a5f68f6055203c70db6e322bf Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 4 Nov 2022 09:24:49 +0000 Subject: [PATCH] requests: Make them private I hope this works... Signed-off-by: Michael Tremer --- src/_pakfire/pakfire.c | 1 + src/libpakfire/include/pakfire/request.h | 22 ++++++++-------- src/libpakfire/libpakfire.sym | 20 -------------- src/libpakfire/request.c | 33 ++++++++++++------------ 4 files changed, 28 insertions(+), 48 deletions(-) diff --git a/src/_pakfire/pakfire.c b/src/_pakfire/pakfire.c index e2f67f377..3f9003a6a 100644 --- a/src/_pakfire/pakfire.c +++ b/src/_pakfire/pakfire.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include "archive.h" diff --git a/src/libpakfire/include/pakfire/request.h b/src/libpakfire/include/pakfire/request.h index a626ccf7e..12be470d2 100644 --- a/src/libpakfire/include/pakfire/request.h +++ b/src/libpakfire/include/pakfire/request.h @@ -21,13 +21,6 @@ #ifndef PAKFIRE_REQUEST_H #define PAKFIRE_REQUEST_H -struct pakfire_request; - -#include -#include -#include -#include - enum pakfire_request_flags { PAKFIRE_REQUEST_WITHOUT_RECOMMENDED = 1 << 0, PAKFIRE_REQUEST_ALLOW_UNINSTALL = 1 << 1, @@ -40,6 +33,17 @@ enum pakfire_request_job_flags { PAKFIRE_REQUEST_ESSENTIAL = 1 << 2, }; +#ifdef PAKFIRE_PRIVATE + +#include + +#include +#include +#include +#include + +struct pakfire_request; + int pakfire_request_create(struct pakfire_request** request, struct pakfire* pakfire, int flags); struct pakfire_request* pakfire_request_ref(struct pakfire_request* request); @@ -68,10 +72,6 @@ int pakfire_request_verify(struct pakfire_request* request, int flags); int pakfire_request_take_solution(struct pakfire_request* request, struct pakfire_solution* solution); -#ifdef PAKFIRE_PRIVATE - -#include - Solver* pakfire_request_get_solver(struct pakfire_request* request); int pakfire_request_next_problem( diff --git a/src/libpakfire/libpakfire.sym b/src/libpakfire/libpakfire.sym index 90c8e4c95..f21a9d58a 100644 --- a/src/libpakfire/libpakfire.sym +++ b/src/libpakfire/libpakfire.sym @@ -261,26 +261,6 @@ global: pakfire_repolist_ref; pakfire_repolist_unref; - # request - pakfire_request_create; - pakfire_request_erase; - pakfire_request_erase_package; - pakfire_request_get_pool; - pakfire_request_get_transaction; - pakfire_request_install; - pakfire_request_install_package; - pakfire_request_lock; - pakfire_request_lock_package; - pakfire_request_ref; - pakfire_request_solve; - pakfire_request_sync; - pakfire_request_take_solution; - pakfire_request_update; - pakfire_request_update_all; - pakfire_request_update_package; - pakfire_request_unref; - pakfire_request_verify; - # solution pakfire_solution_ref; pakfire_solution_to_string; diff --git a/src/libpakfire/request.c b/src/libpakfire/request.c index b9f1b5706..4962fdda3 100644 --- a/src/libpakfire/request.c +++ b/src/libpakfire/request.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -149,7 +148,7 @@ static int setup_solver(struct pakfire_request* request, int flags) { return 0; } -PAKFIRE_EXPORT int pakfire_request_create(struct pakfire_request** request, +int pakfire_request_create(struct pakfire_request** request, struct pakfire* pakfire, int flags) { Pool* pool = pakfire_get_solv_pool(pakfire); int r = 1; @@ -189,13 +188,13 @@ ERROR: return r; } -PAKFIRE_EXPORT struct pakfire_request* pakfire_request_ref(struct pakfire_request* request) { +struct pakfire_request* pakfire_request_ref(struct pakfire_request* request) { request->nrefs++; return request; } -PAKFIRE_EXPORT struct pakfire_request* pakfire_request_unref(struct pakfire_request* request) { +struct pakfire_request* pakfire_request_unref(struct pakfire_request* request) { if (--request->nrefs > 0) return request; @@ -207,7 +206,7 @@ Solver* pakfire_request_get_solver(struct pakfire_request* request) { return request->solver; } -PAKFIRE_EXPORT int pakfire_request_solve(struct pakfire_request* request, +int pakfire_request_solve(struct pakfire_request* request, struct pakfire_transaction** transaction) { int r; @@ -452,12 +451,12 @@ static int pakfire_request_add(struct pakfire_request* request, int action, return pakfire_request_add_job(request, action, what, extra_flags); } -PAKFIRE_EXPORT int pakfire_request_install(struct pakfire_request* request, +int pakfire_request_install(struct pakfire_request* request, const char* what, int flags) { return pakfire_request_add(request, SOLVER_INSTALL, what, flags); } -PAKFIRE_EXPORT int pakfire_request_install_package( +int pakfire_request_install_package( struct pakfire_request* request, struct pakfire_package* package) { return pakfire_request_add_package(request, SOLVER_INSTALL, package, 0); } @@ -472,31 +471,31 @@ static int erase_flags(int flags) { return additional; } -PAKFIRE_EXPORT int pakfire_request_erase(struct pakfire_request* request, const char* what, int flags) { +int pakfire_request_erase(struct pakfire_request* request, const char* what, int flags) { return pakfire_request_add(request, SOLVER_ERASE, what, erase_flags(flags)); } -PAKFIRE_EXPORT int pakfire_request_erase_package( +int pakfire_request_erase_package( struct pakfire_request* request, struct pakfire_package* package, int flags) { return pakfire_request_add_package(request, SOLVER_ERASE, package, erase_flags(flags)); } -PAKFIRE_EXPORT int pakfire_request_update(struct pakfire_request* request, const char* what, int flags) { +int pakfire_request_update(struct pakfire_request* request, const char* what, int flags) { return pakfire_request_add(request, SOLVER_UPDATE, what, flags); } -PAKFIRE_EXPORT int pakfire_request_update_package( +int pakfire_request_update_package( struct pakfire_request* request, struct pakfire_package* package) { return pakfire_request_add_package(request, SOLVER_UPDATE, package, 0); } -PAKFIRE_EXPORT int pakfire_request_update_all(struct pakfire_request* request, int flags) { +int pakfire_request_update_all(struct pakfire_request* request, int flags) { queue_push2(&request->jobs, SOLVER_SOLVABLE_ALL|SOLVER_UPDATE|erase_flags(flags), 0); return 0; } -PAKFIRE_EXPORT int pakfire_request_sync(struct pakfire_request* request, int flags) { +int pakfire_request_sync(struct pakfire_request* request, int flags) { int solver_flags = SOLVER_SOLVABLE_ALL|SOLVER_DISTUPGRADE; // Drop orphans @@ -508,15 +507,15 @@ PAKFIRE_EXPORT int pakfire_request_sync(struct pakfire_request* request, int fla return 0; } -PAKFIRE_EXPORT int pakfire_request_lock(struct pakfire_request* request, const char* what) { +int pakfire_request_lock(struct pakfire_request* request, const char* what) { return pakfire_request_add(request, SOLVER_LOCK, what, 0); } -PAKFIRE_EXPORT int pakfire_request_lock_package(struct pakfire_request* request, struct pakfire_package* package) { +int pakfire_request_lock_package(struct pakfire_request* request, struct pakfire_package* package) { return pakfire_request_add_package(request, SOLVER_LOCK, package, 0); } -PAKFIRE_EXPORT int pakfire_request_verify(struct pakfire_request* request, int flags) { +int pakfire_request_verify(struct pakfire_request* request, int flags) { queue_push2(&request->jobs, SOLVER_SOLVABLE_ALL|SOLVER_VERIFY, 0); return 0; @@ -550,7 +549,7 @@ int pakfire_request_next_problem( return pakfire_problem_create(problem, request->pakfire, request, id); } -PAKFIRE_EXPORT int pakfire_request_take_solution(struct pakfire_request* request, +int pakfire_request_take_solution(struct pakfire_request* request, struct pakfire_solution* solution) { struct pakfire_problem* problem = pakfire_solution_get_problem(solution); -- 2.39.5