From: Michael Tremer Date: Thu, 24 Jun 2021 21:42:40 +0000 (+0000) Subject: problems: Drop linked list X-Git-Tag: 0.9.28~1174 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf75652cac4679f6857e9eb845883f85eeaf0d26;p=pakfire.git problems: Drop linked list Signed-off-by: Michael Tremer --- diff --git a/src/libpakfire/include/pakfire/problem.h b/src/libpakfire/include/pakfire/problem.h index b60284348..e5055bb80 100644 --- a/src/libpakfire/include/pakfire/problem.h +++ b/src/libpakfire/include/pakfire/problem.h @@ -32,9 +32,6 @@ int pakfire_problem_create(struct pakfire_problem** problem, struct pakfire_requ struct pakfire_problem* pakfire_problem_ref(struct pakfire_problem* problem); struct pakfire_problem* pakfire_problem_unref(struct pakfire_problem* problem); -struct pakfire_problem* pakfire_problem_next(struct pakfire_problem* problem); -void pakfire_problem_append(struct pakfire_problem* problem, struct pakfire_problem* new_problem); - const char* pakfire_problem_to_string(struct pakfire_problem* problem); struct pakfire_request* pakfire_problem_get_request(struct pakfire_problem* problem); diff --git a/src/libpakfire/libpakfire.sym b/src/libpakfire/libpakfire.sym index 2b3d9a009..f70e30c87 100644 --- a/src/libpakfire/libpakfire.sym +++ b/src/libpakfire/libpakfire.sym @@ -238,10 +238,8 @@ global: pakfire_parser_error_unref; # problem - pakfire_problem_append; pakfire_problem_create; pakfire_problem_get_solutions; - pakfire_problem_next; pakfire_problem_ref; pakfire_problem_to_string; pakfire_problem_unref; diff --git a/src/libpakfire/problem.c b/src/libpakfire/problem.c index 56e514e45..2ee857859 100644 --- a/src/libpakfire/problem.c +++ b/src/libpakfire/problem.c @@ -32,12 +32,11 @@ struct pakfire_problem { Pakfire pakfire; + int nrefs; + struct pakfire_request* request; Id id; char* string; - - struct pakfire_problem* next; - int nrefs; }; static char* to_string(struct pakfire_problem* problem) { @@ -230,7 +229,6 @@ PAKFIRE_EXPORT struct pakfire_problem* pakfire_problem_ref(struct pakfire_proble } static void pakfire_problem_free(struct pakfire_problem* problem) { - pakfire_problem_unref(problem->next); pakfire_request_unref(problem->request); if (problem->string) @@ -255,21 +253,6 @@ Pakfire pakfire_problem_get_pakfire(struct pakfire_problem* problem) { return pakfire_ref(problem->pakfire); } -PAKFIRE_EXPORT struct pakfire_problem* pakfire_problem_next(struct pakfire_problem* problem) { - return problem->next; -} - -PAKFIRE_EXPORT void pakfire_problem_append(struct pakfire_problem* problem, struct pakfire_problem* new_problem) { - struct pakfire_problem* next; - - // Go to last problem in list - while ((next = pakfire_problem_next(problem)) != NULL) { - problem = next; - } - - problem->next = pakfire_problem_ref(new_problem); -} - PAKFIRE_EXPORT const char* pakfire_problem_to_string(struct pakfire_problem* problem) { return problem->string; }