From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 29 Jun 2021 14:57:18 +0000 (+0000)
Subject: problem: Pass pakfire as first argument
X-Git-Tag: 0.9.28~1163
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f446d92edcc7b79c86c1a6b9944f129da3940e58;p=pakfire.git

problem: Pass pakfire as first argument

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/include/pakfire/problem.h b/src/libpakfire/include/pakfire/problem.h
index 9297c1c72..f4ffd5ad1 100644
--- a/src/libpakfire/include/pakfire/problem.h
+++ b/src/libpakfire/include/pakfire/problem.h
@@ -39,7 +39,8 @@ PakfireSolution pakfire_problem_get_solutions(struct pakfire_problem* problem);
 
 #include <pakfire/request.h>
 
-int pakfire_problem_create(struct pakfire_problem** problem, struct pakfire_request* request, Id id);
+int pakfire_problem_create(struct pakfire_problem** problem, Pakfire pakfire,
+	struct pakfire_request* request, Id id);
 
 Pakfire pakfire_problem_get_pakfire(struct pakfire_problem* problem);
 Id pakfire_problem_get_id(struct pakfire_problem* problem);
diff --git a/src/libpakfire/include/pakfire/request.h b/src/libpakfire/include/pakfire/request.h
index 496b258fb..af640abcf 100644
--- a/src/libpakfire/include/pakfire/request.h
+++ b/src/libpakfire/include/pakfire/request.h
@@ -70,7 +70,6 @@ int pakfire_request_verify(struct pakfire_request* request, int flags);
 
 #include <solv/solver.h>
 
-Pakfire pakfire_request_get_pakfire(struct pakfire_request* request);
 Solver* pakfire_request_get_solver(struct pakfire_request* request);
 
 #endif
diff --git a/src/libpakfire/problem.c b/src/libpakfire/problem.c
index fe44d5add..987c080ec 100644
--- a/src/libpakfire/problem.c
+++ b/src/libpakfire/problem.c
@@ -204,12 +204,12 @@ static char* to_string(struct pakfire_problem* problem) {
 }
 
 PAKFIRE_EXPORT int pakfire_problem_create(struct pakfire_problem** problem,
-		struct pakfire_request* request, Id id) {
+		Pakfire pakfire, struct pakfire_request* request, Id id) {
 	struct pakfire_problem* p = calloc(1, sizeof(*problem));
 	if (!p)
 		return 1;
 
-	p->pakfire = pakfire_request_get_pakfire(request);
+	p->pakfire = pakfire_ref(pakfire);
 	p->nrefs = 1;
 
 	p->request = pakfire_request_ref(request);
diff --git a/src/libpakfire/request.c b/src/libpakfire/request.c
index 4a128af7d..3a669c33c 100644
--- a/src/libpakfire/request.c
+++ b/src/libpakfire/request.c
@@ -217,7 +217,7 @@ static int pakfire_request_get_problems(struct pakfire_request* request,
 			break;
 
 		// Create problem
-		int r = pakfire_problem_create(&problem, request, p);
+		int r = pakfire_problem_create(&problem, request->pakfire, request, p);
 		if (r)
 			goto ERROR;