mirror: 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 90a4a131b4dffa81acd13370d33259d8973fbf50..d3979deb75627b314e785124f1216e1d4fbc44f7 100644 (file)
--- a/src/pakfire/dist.c
+++ b/src/pakfire/dist.c
@@ -233,7 +233,7 @@ ERROR:
 static int pakfire_dist_get_mirrorlist(pakfire_ctx* ctx, struct pakfire* pakfire,
                struct pakfire_parser* makefile, pakfire_mirrorlist** list) {
        pakfire_mirrorlist* m = NULL;
-       struct pakfire_mirror* mirror = NULL;
+       pakfire_mirror* mirror = NULL;
        char* p = NULL;
        int r;
 

diff --git a/src/pakfire/mirror.c b/src/pakfire/mirror.c
index 038bfca246f37a9958e217d811a899c760ea2396..9ff394d6636fe98093d904b077f8a6f841c6a2db 100644 (file)
--- a/src/pakfire/mirror.c
+++ b/src/pakfire/mirror.c
@@ -41,16 +41,16 @@ struct pakfire_mirror {
        } flags;
 };
 
-static void pakfire_mirror_free(struct pakfire_mirror* mirror) {
+static void pakfire_mirror_free(pakfire_mirror* mirror) {
        if (mirror->ctx)
                pakfire_ctx_unref(mirror->ctx);
 
        free(mirror);
 }
 
-int pakfire_mirror_create(struct pakfire_mirror** mirror,
+int pakfire_mirror_create(pakfire_mirror** mirror,
                pakfire_ctx* ctx, const char* url) {
-       struct pakfire_mirror* m = NULL;
+       pakfire_mirror* m = NULL;
        int r;
 
        // Allocate the mirror
@@ -92,13 +92,13 @@ ERROR:
        return r;
 }
 
-struct pakfire_mirror* pakfire_mirror_ref(struct pakfire_mirror* mirror) {
+pakfire_mirror* pakfire_mirror_ref(pakfire_mirror* mirror) {
        ++mirror->nrefs;
 
        return mirror;
 }
 
-struct pakfire_mirror* pakfire_mirror_unref(struct pakfire_mirror* mirror) {
+pakfire_mirror* pakfire_mirror_unref(pakfire_mirror* mirror) {
        if (--mirror->nrefs > 0)
                return mirror;
 
@@ -106,13 +106,13 @@ struct pakfire_mirror* pakfire_mirror_unref(struct pakfire_mirror* mirror) {
        return NULL;
 }
 
-const char* pakfire_mirror_get_url(struct pakfire_mirror* mirror) {
+const char* pakfire_mirror_get_url(pakfire_mirror* mirror) {
        return mirror->url;
 }
 
 // Enabled?
 
-int pakfire_mirror_is_enabled(struct pakfire_mirror* mirror) {
+int pakfire_mirror_is_enabled(pakfire_mirror* mirror) {
        return (mirror->flags & PAKFIRE_MIRROR_ENABLED);
 }
 
@@ -120,7 +120,7 @@ int pakfire_mirror_is_enabled(struct pakfire_mirror* mirror) {
        This function is called when a transfer has failed and will automatically
        disable the mirror.
 */
-int pakfire_mirror_xfer_failed(struct pakfire_mirror* self, pakfire_xfer_error_code_t code) {
+int pakfire_mirror_xfer_failed(pakfire_mirror* self, pakfire_xfer_error_code_t code) {
        switch (code) {
                // We should never be called with this
                case PAKFIRE_XFER_OK:

diff --git a/src/pakfire/mirror.h b/src/pakfire/mirror.h
index e38d4094b58a7691e7fc9ac086f747da2ed5a803..180a81a416c06638cbc95a90fdb3b71067dad349 100644 (file)
--- a/src/pakfire/mirror.h
+++ b/src/pakfire/mirror.h
@@ -21,23 +21,23 @@
 #ifndef PAKFIRE_MIRROR_H
 #define PAKFIRE_MIRROR_H
 
-struct pakfire_mirror;
+typedef struct pakfire_mirror pakfire_mirror;
 
 #include <pakfire/ctx.h>
 #include <pakfire/xfer.h>
 
-int pakfire_mirror_create(struct pakfire_mirror** mirror,
+int pakfire_mirror_create(pakfire_mirror** mirror,
        pakfire_ctx* ctx, const char* url);
 
-struct pakfire_mirror* pakfire_mirror_ref(struct pakfire_mirror* mirror);
-struct pakfire_mirror* pakfire_mirror_unref(struct pakfire_mirror* mirror);
+pakfire_mirror* pakfire_mirror_ref(pakfire_mirror* mirror);
+pakfire_mirror* pakfire_mirror_unref(pakfire_mirror* mirror);
 
-const char* pakfire_mirror_get_url(struct pakfire_mirror* mirror);
+const char* pakfire_mirror_get_url(pakfire_mirror* mirror);
 
 // Enabled?
 
-int pakfire_mirror_is_enabled(struct pakfire_mirror* mirror);
+int pakfire_mirror_is_enabled(pakfire_mirror* mirror);
 
-int pakfire_mirror_xfer_failed(struct pakfire_mirror* self, pakfire_xfer_error_code_t code);
+int pakfire_mirror_xfer_failed(pakfire_mirror* self, pakfire_xfer_error_code_t code);
 
 #endif /* PAKFIRE_MIRROR_H */

diff --git a/src/pakfire/mirrorlist.c b/src/pakfire/mirrorlist.c
index df70ab713b5aa28588c6370a0eb9c91eecbde7ec..1cdcc503dc8f5dddbb8871bf278fc4b5a52e9188 100644 (file)
--- a/src/pakfire/mirrorlist.c
+++ b/src/pakfire/mirrorlist.c
@@ -34,7 +34,7 @@ struct pakfire_mirrorlist {
        int nrefs;
 
        // Mirrors
-       struct pakfire_mirror** mirrors;
+       pakfire_mirror** mirrors;
        unsigned int num_mirrors;
 };
 
@@ -119,7 +119,7 @@ static int pakfire_mirrorlist_check_mirrorlist(pakfire_mirrorlist* list,
 
 static int pakfire_mirrorlist_add_mirror_from_url(
                pakfire_mirrorlist* list, const char* url) {
-       struct pakfire_mirror* mirror = NULL;
+       pakfire_mirror* mirror = NULL;
        int r;
 
        // Create a new mirror object
@@ -215,7 +215,7 @@ ERROR:
        return r;
 }
 
-int pakfire_mirrorlist_add_mirror(pakfire_mirrorlist* list, struct pakfire_mirror* mirror) {
+int pakfire_mirrorlist_add_mirror(pakfire_mirrorlist* list, pakfire_mirror* mirror) {
        // Check input
        if (!mirror)
                return -EINVAL;
@@ -238,7 +238,7 @@ int pakfire_mirrorlist_empty(pakfire_mirrorlist* list) {
 /*
        Return the first mirror that isn't disabled
 */
-struct pakfire_mirror* pakfire_mirrorlist_get_first(pakfire_mirrorlist* list) {
+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;
@@ -249,8 +249,8 @@ struct pakfire_mirror* pakfire_mirrorlist_get_first(pakfire_mirrorlist* list) {
        return NULL;
 }
 
-struct pakfire_mirror* pakfire_mirrorlist_get_next(
-               pakfire_mirrorlist* list, struct pakfire_mirror* mirror) {
+pakfire_mirror* pakfire_mirrorlist_get_next(
+               pakfire_mirrorlist* list, 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 140197fd993dc0d484756376cf664026bb51002d..e1b42032c0f22a0da0bc8d8ace837cc70e122842 100644 (file)
--- a/src/pakfire/mirrorlist.h
+++ b/src/pakfire/mirrorlist.h
@@ -34,12 +34,12 @@ pakfire_mirrorlist* pakfire_mirrorlist_unref(pakfire_mirrorlist* list);
 int pakfire_mirrorlist_read(pakfire_mirrorlist* list, const char* path);
 
 int pakfire_mirrorlist_add_mirror(
-       pakfire_mirrorlist* list, struct pakfire_mirror* mirror);
+       pakfire_mirrorlist* list, pakfire_mirror* mirror);
 
 int pakfire_mirrorlist_empty(pakfire_mirrorlist* ml);
 
-struct pakfire_mirror* pakfire_mirrorlist_get_first(pakfire_mirrorlist* list);
-struct pakfire_mirror* pakfire_mirrorlist_get_next(
-       pakfire_mirrorlist* list, struct pakfire_mirror* mirror);
+pakfire_mirror* pakfire_mirrorlist_get_first(pakfire_mirrorlist* list);
+pakfire_mirror* pakfire_mirrorlist_get_next(
+       pakfire_mirrorlist* list, pakfire_mirror* mirror);
 
 #endif /* PAKFIRE_MIRRORLIST_H */

diff --git a/src/pakfire/xfer.c b/src/pakfire/xfer.c
index ea9f54776022fd17dc9a129166d4b4e66cf4675a..e7dc9aeab6a1075ae29dca4949b1a463fa4994bf 100644 (file)
--- a/src/pakfire/xfer.c
+++ b/src/pakfire/xfer.c
@@ -93,7 +93,7 @@ struct pakfire_xfer {
        // Mirrors
        char baseurl[PATH_MAX];
        pakfire_mirrorlist* mirrors;
-       struct pakfire_mirror* mirror;
+       pakfire_mirror* mirror;
 
        // Effective URL
        const char* effective_url;
@@ -503,7 +503,7 @@ const char* pakfire_xfer_get_effective_url(struct pakfire_xfer* xfer) {
 /*
        Helper function to set a chosen mirror
 */
-static int pakfire_xfer_select_mirror(struct pakfire_xfer* self, struct pakfire_mirror* mirror) {
+static int pakfire_xfer_select_mirror(struct pakfire_xfer* self, pakfire_mirror* mirror) {
        // Free the previous mirror
        if (self->mirror) {
                pakfire_mirror_unref(self->mirror);
@@ -525,7 +525,7 @@ static int pakfire_xfer_select_mirror(struct pakfire_xfer* self, struct pakfire_
 }
 
 int pakfire_xfer_set_mirrorlist(struct pakfire_xfer* xfer, pakfire_mirrorlist* mirrors) {
-       struct pakfire_mirror* mirror = NULL;
+       pakfire_mirror* mirror = NULL;
        int r;
 
        // Drop all references to a former mirrorlist
@@ -985,7 +985,7 @@ static pakfire_xfer_error_code_t pakfire_xfer_code(CURLcode code, int http_statu
        Called after something went wrong and we want to try again with another mirror
 */
 static int pakfire_xfer_next_mirror(struct pakfire_xfer* xfer) {
-       struct pakfire_mirror* mirror = NULL;
+       pakfire_mirror* mirror = NULL;
        int r = 0;
 
        // If our mirror is broken, we select the next one