From: Michael Tremer Date: Fri, 2 Jul 2021 16:24:07 +0000 (+0000) Subject: solutions: Stop acting as a linked list X-Git-Tag: 0.9.28~1123 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e985ad81672b196cf7ddba29340277afe431a7a;p=pakfire.git solutions: Stop acting as a linked list Signed-off-by: Michael Tremer --- diff --git a/src/libpakfire/include/pakfire/solution.h b/src/libpakfire/include/pakfire/solution.h index 561006e53..268a6179d 100644 --- a/src/libpakfire/include/pakfire/solution.h +++ b/src/libpakfire/include/pakfire/solution.h @@ -32,9 +32,6 @@ int pakfire_solution_create(struct pakfire_solution** solution, struct pakfire_solution* pakfire_solution_ref(struct pakfire_solution* solution); struct pakfire_solution* pakfire_solution_unref(struct pakfire_solution* solution); -struct pakfire_solution* pakfire_solution_next(struct pakfire_solution* solution); -void pakfire_solution_append(struct pakfire_solution* solution, struct pakfire_solution* new_solution); - char* pakfire_solution_to_string(struct pakfire_solution* solution); #endif /* PAKFIRE_SOLUTION_H */ diff --git a/src/libpakfire/libpakfire.sym b/src/libpakfire/libpakfire.sym index 39ec9f29c..e6351e98c 100644 --- a/src/libpakfire/libpakfire.sym +++ b/src/libpakfire/libpakfire.sym @@ -299,7 +299,6 @@ global: # solution pakfire_solution_create; - pakfire_solution_next; pakfire_solution_ref; pakfire_solution_to_string; pakfire_solution_unref; diff --git a/src/libpakfire/solution.c b/src/libpakfire/solution.c index 841150f40..c91806d43 100644 --- a/src/libpakfire/solution.c +++ b/src/libpakfire/solution.c @@ -38,8 +38,6 @@ struct pakfire_solution { struct pakfire_problem* problem; Id id; char** elements; - - struct pakfire_solution* next; }; static void import_elements(struct pakfire_solution* solution) { @@ -149,9 +147,6 @@ PAKFIRE_EXPORT struct pakfire_solution* pakfire_solution_ref(struct pakfire_solu static void pakfire_solution_free(struct pakfire_solution* solution) { pakfire_unref(solution->pakfire); - if (solution->next) - pakfire_solution_unref(solution->next); - pakfire_problem_unref(solution->problem); if (solution->elements) @@ -172,21 +167,6 @@ PAKFIRE_EXPORT struct pakfire_solution* pakfire_solution_unref(struct pakfire_so return NULL; } -PAKFIRE_EXPORT struct pakfire_solution* pakfire_solution_next(struct pakfire_solution* solution) { - return solution->next; -} - -PAKFIRE_EXPORT void pakfire_solution_append(struct pakfire_solution* solution, struct pakfire_solution* new_solution) { - struct pakfire_solution* next; - - // Go to last problem in list - while ((next = pakfire_solution_next(solution)) != NULL) { - solution = next; - } - - solution->next = pakfire_solution_ref(new_solution); -} - static size_t count_elements_length(struct pakfire_solution* solution) { size_t length = 0;