From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 27 Jun 2025 14:40:29 +0000 (+0000)
Subject: repolist: Create its own type
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2aad893a730aabe51be108c981e140ee1a249c92;p=pakfire.git

repolist: Create its own type

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

diff --git a/src/cli/lib/dump.c b/src/cli/lib/dump.c
index 85262840..d35d9740 100644
--- a/src/cli/lib/dump.c
+++ b/src/cli/lib/dump.c
@@ -65,7 +65,7 @@ int cli_dump_packagelist(pakfire_packagelist* list, int flags) {
 	return pakfire_packagelist_walk(list, __cli_dump_package, &flags, 0);
 }
 
-int cli_dump_repolist(struct pakfire_repolist* list, int flags) {
+int cli_dump_repolist(pakfire_repolist* list, int flags) {
 	struct pakfire_repo* repo = NULL;
 	int r;
 
diff --git a/src/cli/lib/dump.h b/src/cli/lib/dump.h
index 9b553256..606c6333 100644
--- a/src/cli/lib/dump.h
+++ b/src/cli/lib/dump.h
@@ -31,7 +31,7 @@
 int cli_dump_package(pakfire_package* package, int flags);
 int cli_dump_packagelist(pakfire_packagelist* list, int flags);
 
-int cli_dump_repolist(struct pakfire_repolist* list, int flags);
+int cli_dump_repolist(pakfire_repolist* list, int flags);
 
 int cli_dump_json(struct json_object* object);
 
diff --git a/src/cli/lib/repolist.c b/src/cli/lib/repolist.c
index dc7b414b..82982194 100644
--- a/src/cli/lib/repolist.c
+++ b/src/cli/lib/repolist.c
@@ -33,7 +33,7 @@ static const char* doc = "List all available repositories";
 int cli_repolist(void* data, int argc, char* argv[]) {
 	struct cli_global_args* global_args = data;
 	struct pakfire* pakfire = NULL;
-	struct pakfire_repolist* list = NULL;
+	pakfire_repolist* list = NULL;
 	int r;
 
 	// Parse the command line
diff --git a/src/pakfire/pakfire.c b/src/pakfire/pakfire.c
index 14c4f656..4cf739ce 100644
--- a/src/pakfire/pakfire.c
+++ b/src/pakfire/pakfire.c
@@ -1363,9 +1363,9 @@ void pakfire_pool_internalize(struct pakfire* pakfire) {
 	pakfire->internal_flags |= PAKFIRE_POOL_READY;
 }
 
-struct pakfire_repolist* pakfire_get_repos(struct pakfire* pakfire) {
+pakfire_repolist* pakfire_get_repos(struct pakfire* pakfire) {
 	struct pakfire_repo* repo = NULL;
-	struct pakfire_repolist* list;
+	pakfire_repolist* list;
 
 	int r = pakfire_repolist_create(&list);
 	if (r)
diff --git a/src/pakfire/pakfire.h b/src/pakfire/pakfire.h
index c40d4765..045c86cf 100644
--- a/src/pakfire/pakfire.h
+++ b/src/pakfire/pakfire.h
@@ -73,7 +73,7 @@ const char* pakfire_get_arch(struct pakfire* pakfire);
 
 int pakfire_version_compare(struct pakfire* pakfire, const char* evr1, const char* evr2);
 
-struct pakfire_repolist* pakfire_get_repos(struct pakfire* pakfire);
+pakfire_repolist* pakfire_get_repos(struct pakfire* pakfire);
 struct pakfire_repo* pakfire_get_repo(struct pakfire* pakfire, const char* name);
 
 int pakfire_whatprovides(struct pakfire* pakfire, const char* what, int flags,
diff --git a/src/pakfire/repolist.c b/src/pakfire/repolist.c
index cd9c6012..0d3b4183 100644
--- a/src/pakfire/repolist.c
+++ b/src/pakfire/repolist.c
@@ -33,7 +33,7 @@ struct pakfire_repolist {
 	size_t size;
 };
 
-static int pakfire_repolist_grow(struct pakfire_repolist* list, size_t size) {
+static int pakfire_repolist_grow(pakfire_repolist* list, size_t size) {
 	struct pakfire_repo** elements = reallocarray(list->elements,
 		list->elements_size + size, sizeof(*list->elements));
 	if (!elements)
@@ -45,8 +45,8 @@ static int pakfire_repolist_grow(struct pakfire_repolist* list, size_t size) {
 	return 0;
 }
 
-int pakfire_repolist_create(struct pakfire_repolist** list) {
-	struct pakfire_repolist* l = calloc(1, sizeof(*l));
+int pakfire_repolist_create(pakfire_repolist** list) {
+	pakfire_repolist* l = calloc(1, sizeof(*l));
 	if (!l)
 		return ENOMEM;
 
@@ -56,20 +56,20 @@ int pakfire_repolist_create(struct pakfire_repolist** list) {
 	return 0;
 }
 
-struct pakfire_repolist* pakfire_repolist_ref(
-		struct pakfire_repolist* list) {
+pakfire_repolist* pakfire_repolist_ref(
+		pakfire_repolist* list) {
 	list->nrefs++;
 
 	return list;
 }
 
-static void pakfire_repolist_free(struct pakfire_repolist* list) {
+static void pakfire_repolist_free(pakfire_repolist* list) {
 	pakfire_repolist_clear(list);
 	free(list);
 }
 
-struct pakfire_repolist* pakfire_repolist_unref(
-		struct pakfire_repolist* list) {
+pakfire_repolist* pakfire_repolist_unref(
+		pakfire_repolist* list) {
 	if (--list->nrefs > 0)
 		return list;
 
@@ -77,7 +77,7 @@ struct pakfire_repolist* pakfire_repolist_unref(
 	return NULL;
 }
 
-void pakfire_repolist_clear(struct pakfire_repolist* list) {
+void pakfire_repolist_clear(pakfire_repolist* list) {
 	if (!list->elements)
 		return;
 
@@ -91,22 +91,22 @@ void pakfire_repolist_clear(struct pakfire_repolist* list) {
 	list->size = 0;
 }
 
-size_t pakfire_repolist_size(struct pakfire_repolist* list) {
+size_t pakfire_repolist_size(pakfire_repolist* list) {
 	return list->size;
 }
 
-int pakfire_repolist_empty(struct pakfire_repolist* list) {
+int pakfire_repolist_empty(pakfire_repolist* list) {
 	return list->size == 0;
 }
 
-struct pakfire_repo* pakfire_repolist_get(struct pakfire_repolist* list, size_t index) {
+struct pakfire_repo* pakfire_repolist_get(pakfire_repolist* list, size_t index) {
 	if (index >= list->size)
 		return NULL;
 
 	return pakfire_repo_ref(list->elements[index]);
 }
 
-int pakfire_repolist_append(struct pakfire_repolist* list, struct pakfire_repo* repo) {
+int pakfire_repolist_append(pakfire_repolist* list, struct pakfire_repo* repo) {
 	if (!repo)
 		return EINVAL;
 
diff --git a/src/pakfire/repolist.h b/src/pakfire/repolist.h
index 3adb2243..50b4684a 100644
--- a/src/pakfire/repolist.h
+++ b/src/pakfire/repolist.h
@@ -23,19 +23,19 @@
 
 #include <pakfire/repo.h>
 
-struct pakfire_repolist;
+typedef struct pakfire_repolist pakfire_repolist;
 
-int pakfire_repolist_create(struct pakfire_repolist** list);
+int pakfire_repolist_create(pakfire_repolist** list);
 
-struct pakfire_repolist* pakfire_repolist_ref(struct pakfire_repolist* list);
-struct pakfire_repolist* pakfire_repolist_unref(struct pakfire_repolist* list);
+pakfire_repolist* pakfire_repolist_ref(pakfire_repolist* list);
+pakfire_repolist* pakfire_repolist_unref(pakfire_repolist* list);
 
-void pakfire_repolist_clear(struct pakfire_repolist* list);
+void pakfire_repolist_clear(pakfire_repolist* list);
 
-size_t pakfire_repolist_size(struct pakfire_repolist* list);
-int pakfire_repolist_empty(struct pakfire_repolist* list);
+size_t pakfire_repolist_size(pakfire_repolist* list);
+int pakfire_repolist_empty(pakfire_repolist* list);
 
-struct pakfire_repo* pakfire_repolist_get(struct pakfire_repolist* list, size_t index);
-int pakfire_repolist_append(struct pakfire_repolist* list, struct pakfire_repo* repo);
+struct pakfire_repo* pakfire_repolist_get(pakfire_repolist* list, size_t index);
+int pakfire_repolist_append(pakfire_repolist* list, struct pakfire_repo* repo);
 
 #endif /* PAKFIRE_REPOLIST_H */
diff --git a/src/python/pakfire.c b/src/python/pakfire.c
index e75170e8..5295b913 100644
--- a/src/python/pakfire.c
+++ b/src/python/pakfire.c
@@ -388,7 +388,7 @@ static PyObject* Pakfire_dist(PakfireObject* self, PyObject* args) {
 }
 
 static PyObject* Pakfire_get_repos(PakfireObject* self) {
-	struct pakfire_repolist* repos = pakfire_get_repos(self->pakfire);
+	pakfire_repolist* repos = pakfire_get_repos(self->pakfire);
 	if (!repos) {
 		PyErr_SetFromErrno(PyExc_OSError);
 		return NULL;