mirrorlist: Create its own type

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

diff --git a/src/pakfire/dist.c b/src/pakfire/dist.c
index c1f1ba21b31cfc2e16a5c9323da52bb05ad4e7f1..90a4a131b4dffa81acd13370d33259d8973fbf50 100644 (file)
--- a/src/pakfire/dist.c
+++ b/src/pakfire/dist.c
@@ -231,8 +231,8 @@ ERROR:
 }
 
 static int pakfire_dist_get_mirrorlist(pakfire_ctx* ctx, struct pakfire* pakfire,
-               struct pakfire_parser* makefile, struct pakfire_mirrorlist** list) {
-       struct pakfire_mirrorlist* m = NULL;
+               struct pakfire_parser* makefile, pakfire_mirrorlist** list) {
+       pakfire_mirrorlist* m = NULL;
        struct pakfire_mirror* mirror = NULL;
        char* p = NULL;
        int r;
@@ -281,11 +281,11 @@ ERROR:
 }
 
 static int pakfire_dist_download_source(pakfire_ctx* ctx,
-       struct pakfire_mirrorlist* mirrorlist, const char* cache_path, const char* filename, ...)
+       pakfire_mirrorlist* mirrorlist, const char* cache_path, const char* filename, ...)
        __attribute__((format(printf, 4, 5)));
 
 static int pakfire_dist_download_source(pakfire_ctx* ctx,
-               struct pakfire_mirrorlist* mirrorlist, const char* cache_path, const char* filename, ...) {
+               pakfire_mirrorlist* mirrorlist, const char* cache_path, const char* filename, ...) {
        struct pakfire_xfer* xfer = NULL;
        va_list args;
        int r;
@@ -326,7 +326,7 @@ ERROR:
 
 static int pakfire_dist_add_source(struct pakfire* pakfire, struct pakfire_packager* packager,
                struct pakfire_package* pkg, pakfire_ctx* ctx,
-               struct pakfire_mirrorlist* mirrorlist, const char* filename) {
+               pakfire_mirrorlist* mirrorlist, const char* filename) {
        char archive_path[PATH_MAX];
        char cache_path[PATH_MAX];
        int r;
@@ -353,7 +353,7 @@ static int pakfire_dist_add_source(struct pakfire* pakfire, struct pakfire_packa
 
 static int pakfire_dist_add_sources(pakfire_ctx* ctx, struct pakfire* pakfire,
                struct pakfire_packager* packager, struct pakfire_package* pkg, struct pakfire_parser* makefile) {
-       struct pakfire_mirrorlist* mirrorlist = NULL;
+       pakfire_mirrorlist* mirrorlist = NULL;
        char* sources = NULL;
        char* p = NULL;
        int r;

diff --git a/src/pakfire/mirrorlist.c b/src/pakfire/mirrorlist.c
index 06233d9cfe87541c555c78a4d337de91428e3d7b..df70ab713b5aa28588c6370a0eb9c91eecbde7ec 100644 (file)
--- a/src/pakfire/mirrorlist.c
+++ b/src/pakfire/mirrorlist.c
@@ -38,7 +38,7 @@ struct pakfire_mirrorlist {
        unsigned int num_mirrors;
 };
 
-static void pakfire_mirrorlist_clear(struct pakfire_mirrorlist* list) {
+static void pakfire_mirrorlist_clear(pakfire_mirrorlist* list) {
        if (list->mirrors) {
                for (unsigned int i = 0; i < list->num_mirrors; i++)
                        pakfire_mirror_unref(list->mirrors[i]);
@@ -50,7 +50,7 @@ static void pakfire_mirrorlist_clear(struct pakfire_mirrorlist* list) {
        }
 }
 
-static void pakfire_mirrorlist_free(struct pakfire_mirrorlist* list) {
+static void pakfire_mirrorlist_free(pakfire_mirrorlist* list) {
        pakfire_mirrorlist_clear(list);
 
        if (list->ctx)
@@ -58,8 +58,8 @@ static void pakfire_mirrorlist_free(struct pakfire_mirrorlist* list) {
        free(list);
 }
 
-int pakfire_mirrorlist_create(struct pakfire_mirrorlist** list, pakfire_ctx* ctx) {
-       struct pakfire_mirrorlist* l = NULL;
+int pakfire_mirrorlist_create(pakfire_mirrorlist** list, pakfire_ctx* ctx) {
+       pakfire_mirrorlist* l = NULL;
 
        // Allocate a new list
        l = calloc(1, sizeof(*l));
@@ -78,13 +78,13 @@ int pakfire_mirrorlist_create(struct pakfire_mirrorlist** list, pakfire_ctx* ctx
        return 0;
 }
 
-struct pakfire_mirrorlist* pakfire_mirrorlist_ref(struct pakfire_mirrorlist* list) {
+pakfire_mirrorlist* pakfire_mirrorlist_ref(pakfire_mirrorlist* list) {
        ++list->nrefs;
 
        return list;
 }
 
-struct pakfire_mirrorlist* pakfire_mirrorlist_unref(struct pakfire_mirrorlist* list) {
+pakfire_mirrorlist* pakfire_mirrorlist_unref(pakfire_mirrorlist* list) {
        if (--list->nrefs > 0)
                return list;
 
@@ -92,7 +92,7 @@ struct pakfire_mirrorlist* pakfire_mirrorlist_unref(struct pakfire_mirrorlist* l
        return NULL;
 }
 
-static int pakfire_mirrorlist_check_mirrorlist(struct pakfire_mirrorlist* list,
+static int pakfire_mirrorlist_check_mirrorlist(pakfire_mirrorlist* list,
                struct json_object* root) {
        struct json_object* typeobj = NULL;
        int r;
@@ -118,7 +118,7 @@ static int pakfire_mirrorlist_check_mirrorlist(struct pakfire_mirrorlist* list,
 }
 
 static int pakfire_mirrorlist_add_mirror_from_url(
-               struct pakfire_mirrorlist* list, const char* url) {
+               pakfire_mirrorlist* list, const char* url) {
        struct pakfire_mirror* mirror = NULL;
        int r;
 
@@ -139,7 +139,7 @@ ERROR:
        return r;
 }
 
-int pakfire_mirrorlist_read(struct pakfire_mirrorlist* list, const char* path) {
+int pakfire_mirrorlist_read(pakfire_mirrorlist* list, const char* path) {
        struct json_object* json = NULL;
        char* error = NULL;
        int r;
@@ -215,7 +215,7 @@ ERROR:
        return r;
 }
 
-int pakfire_mirrorlist_add_mirror(struct pakfire_mirrorlist* list, struct pakfire_mirror* mirror) {
+int pakfire_mirrorlist_add_mirror(pakfire_mirrorlist* list, struct pakfire_mirror* mirror) {
        // Check input
        if (!mirror)
                return -EINVAL;
@@ -231,14 +231,14 @@ int pakfire_mirrorlist_add_mirror(struct pakfire_mirrorlist* list, struct pakfir
        return 0;
 }
 
-int pakfire_mirrorlist_empty(struct pakfire_mirrorlist* list) {
+int pakfire_mirrorlist_empty(pakfire_mirrorlist* list) {
        return list->num_mirrors == 0;
 }
 
 /*
        Return the first mirror that isn't disabled
 */
-struct pakfire_mirror* pakfire_mirrorlist_get_first(struct pakfire_mirrorlist* list) {
+struct pakfire_mirror* pakfire_mirrorlist_get_first(pakfire_mirrorlist* list) {
        for (unsigned int i = 0; i < list->num_mirrors; i++) {
                if (!pakfire_mirror_is_enabled(list->mirrors[i]))
                        continue;
@@ -250,7 +250,7 @@ struct pakfire_mirror* pakfire_mirrorlist_get_first(struct pakfire_mirrorlist* l
 }
 
 struct pakfire_mirror* pakfire_mirrorlist_get_next(
-               struct pakfire_mirrorlist* list, struct pakfire_mirror* mirror) {
+               pakfire_mirrorlist* list, struct pakfire_mirror* mirror) {
        // Return NULL if we have reached the end of the list
        if (!mirror)
                return NULL;

diff --git a/src/pakfire/mirrorlist.h b/src/pakfire/mirrorlist.h
index 999a864bbe5bce378bbe81a77debe973068f12e1..140197fd993dc0d484756376cf664026bb51002d 100644 (file)
--- a/src/pakfire/mirrorlist.h
+++ b/src/pakfire/mirrorlist.h
@@ -21,25 +21,25 @@
 #ifndef PAKFIRE_MIRRORLIST_H
 #define PAKFIRE_MIRRORLIST_H
 
-struct pakfire_mirrorlist;
+typedef struct pakfire_mirrorlist pakfire_mirrorlist;
 
 #include <pakfire/ctx.h>
 #include <pakfire/mirror.h>
 
-int pakfire_mirrorlist_create(struct pakfire_mirrorlist** list, pakfire_ctx* ctx);
+int pakfire_mirrorlist_create(pakfire_mirrorlist** list, pakfire_ctx* ctx);
 
-struct pakfire_mirrorlist* pakfire_mirrorlist_ref(struct pakfire_mirrorlist* list);
-struct pakfire_mirrorlist* pakfire_mirrorlist_unref(struct pakfire_mirrorlist* list);
+pakfire_mirrorlist* pakfire_mirrorlist_ref(pakfire_mirrorlist* list);
+pakfire_mirrorlist* pakfire_mirrorlist_unref(pakfire_mirrorlist* list);
 
-int pakfire_mirrorlist_read(struct pakfire_mirrorlist* list, const char* path);
+int pakfire_mirrorlist_read(pakfire_mirrorlist* list, const char* path);
 
 int pakfire_mirrorlist_add_mirror(
-       struct pakfire_mirrorlist* list, struct pakfire_mirror* mirror);
+       pakfire_mirrorlist* list, struct pakfire_mirror* mirror);
 
-int pakfire_mirrorlist_empty(struct pakfire_mirrorlist* ml);
+int pakfire_mirrorlist_empty(pakfire_mirrorlist* ml);
 
-struct pakfire_mirror* pakfire_mirrorlist_get_first(struct pakfire_mirrorlist* list);
+struct pakfire_mirror* pakfire_mirrorlist_get_first(pakfire_mirrorlist* list);
 struct pakfire_mirror* pakfire_mirrorlist_get_next(
-       struct pakfire_mirrorlist* list, struct pakfire_mirror* mirror);
+       pakfire_mirrorlist* list, struct pakfire_mirror* mirror);
 
 #endif /* PAKFIRE_MIRRORLIST_H */

diff --git a/src/pakfire/repo.c b/src/pakfire/repo.c
index 3de7bd2f7ededd75cb8d9c1f94d359d8305100ef..b6a761b2f9a96294c1e3f161af9ecb7f39c9fa86 100644 (file)
--- a/src/pakfire/repo.c
+++ b/src/pakfire/repo.c
@@ -107,7 +107,7 @@ struct pakfire_repo_appdata {
        pakfire_key* key;
 
        // Mirrorlist
-       struct pakfire_mirrorlist* mirrorlist;
+       pakfire_mirrorlist* mirrorlist;
 
        // Mirrorlist URL
        char mirrorlist_url[PATH_MAX];
@@ -270,7 +270,7 @@ static int pakfire_repo_xfer_create(struct pakfire_xfer** xfer, struct pakfire_r
 */
 static int pakfire_repo_xfer_create(
                struct pakfire_xfer** xfer, struct pakfire_repo* repo, const char* url, ...) {
-       struct pakfire_mirrorlist* mirrorlist = NULL;
+       pakfire_mirrorlist* mirrorlist = NULL;
        struct pakfire_xfer* x = NULL;
        const char* baseurl = NULL;
        va_list args;
@@ -585,7 +585,7 @@ CLEANUP:
        return r;
 }
 
-struct pakfire_mirrorlist* pakfire_repo_get_mirrorlist(struct pakfire_repo* self) {
+pakfire_mirrorlist* pakfire_repo_get_mirrorlist(struct pakfire_repo* self) {
        if (self->appdata->mirrorlist)
                return pakfire_mirrorlist_ref(self->appdata->mirrorlist);
 
@@ -1158,7 +1158,7 @@ ERROR:
 }
 
 static int pakfire_repo_refresh_mirrorlist(struct pakfire_repo* self, const int force) {
-       struct pakfire_mirrorlist* mirrorlist = NULL;
+       pakfire_mirrorlist* mirrorlist = NULL;
        char path[PATH_MAX];
        int r;
 

diff --git a/src/pakfire/repo.h b/src/pakfire/repo.h
index 18a2d60c16627f9897190d1b3bf3c3326a9ea2e3..572b823040ca2ae96097826c2306a8825f9eca2d 100644 (file)
--- a/src/pakfire/repo.h
+++ b/src/pakfire/repo.h
@@ -33,6 +33,7 @@ struct pakfire_repo;
 #include <pakfire/config.h>
 #include <pakfire/httpclient.h>
 #include <pakfire/key.h>
+#include <pakfire/mirrorlist.h>
 #include <pakfire/package.h>
 #include <pakfire/packagelist.h>
 #include <pakfire/pakfire.h>
@@ -69,7 +70,7 @@ pakfire_key* pakfire_repo_get_key(struct pakfire_repo* repo);
 const char* pakfire_repo_get_mirrorlist_url(struct pakfire_repo* repo);
 int pakfire_repo_set_mirrorlist_url(struct pakfire_repo* repo, const char* url);
 
-struct pakfire_mirrorlist* pakfire_repo_get_mirrors(struct pakfire_repo* repo);
+pakfire_mirrorlist* pakfire_repo_get_mirrors(struct pakfire_repo* repo);
 
 #define pakfire_repo_path(repo, path, format, ...) \
        __pakfire_repo_path(repo, path, sizeof(path), format, __VA_ARGS__)
@@ -146,7 +147,7 @@ void pakfire_repo_free_all(struct pakfire* pakfire);
 Repo* pakfire_repo_get_repo(struct pakfire_repo* repo);
 Repodata* pakfire_repo_get_repodata(struct pakfire_repo* repo);
 
-struct pakfire_mirrorlist* pakfire_repo_get_mirrorlist(struct pakfire_repo* repo);
+pakfire_mirrorlist* pakfire_repo_get_mirrorlist(struct pakfire_repo* repo);
 
 int pakfire_repo_walk_packages(struct pakfire_repo* self,
        int (*callback)(pakfire_ctx* ctx, struct pakfire_package* pkg, void* data), void* data, int flags);

diff --git a/src/pakfire/xfer.c b/src/pakfire/xfer.c
index 2481185fb5e5a882f33b49c2af639195d0574328..ea9f54776022fd17dc9a129166d4b4e66cf4675a 100644 (file)
--- a/src/pakfire/xfer.c
+++ b/src/pakfire/xfer.c
@@ -92,7 +92,7 @@ struct pakfire_xfer {
 
        // Mirrors
        char baseurl[PATH_MAX];
-       struct pakfire_mirrorlist* mirrors;
+       pakfire_mirrorlist* mirrors;
        struct pakfire_mirror* mirror;
 
        // Effective URL
@@ -524,7 +524,7 @@ static int pakfire_xfer_select_mirror(struct pakfire_xfer* self, struct pakfire_
        return 0;
 }
 
-int pakfire_xfer_set_mirrorlist(struct pakfire_xfer* xfer, struct pakfire_mirrorlist* mirrors) {
+int pakfire_xfer_set_mirrorlist(struct pakfire_xfer* xfer, pakfire_mirrorlist* mirrors) {
        struct pakfire_mirror* mirror = NULL;
        int r;
 

diff --git a/src/pakfire/xfer.h b/src/pakfire/xfer.h
index c659650bc0c63b3d45780e5a67f11aad71e5e9a7..20bec565c2566032af623a4cd9580b4b9a3aa481 100644 (file)
--- a/src/pakfire/xfer.h
+++ b/src/pakfire/xfer.h
@@ -115,7 +115,7 @@ int pakfire_xfer_set_title(struct pakfire_xfer* xfer, const char* title);
 int pakfire_xfer_set_baseurl(struct pakfire_xfer* xfer, const char* baseurl);
 const char* pakfire_xfer_get_effective_url(struct pakfire_xfer* xfer);
 
-int pakfire_xfer_set_mirrorlist(struct pakfire_xfer* xfer, struct pakfire_mirrorlist* mirrors);
+int pakfire_xfer_set_mirrorlist(struct pakfire_xfer* xfer, pakfire_mirrorlist* mirrors);
 
 size_t pakfire_xfer_get_size(struct pakfire_xfer* xfer);
 int pakfire_xfer_set_size(struct pakfire_xfer* xfer, size_t size);