downloader: Rename current_mirror to mirror

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

diff --git a/src/libpakfire/downloader.c b/src/libpakfire/downloader.c
index 61e5dcaf894d1748b5530404eba9c794f644b819..d4add68baa9a050c29138c12eb3c3ec516d180b9 100644 (file)
--- a/src/libpakfire/downloader.c
+++ b/src/libpakfire/downloader.c
@@ -65,7 +65,7 @@ struct pakfire_transfer {
        FILE* f;
 
        // Mirrors
-       int current_mirror;
+       int mirror;
 };
 
 struct pakfire_downloader {
@@ -420,7 +420,7 @@ int pakfire_downloader_add_transfer(
                return ENOMEM;
 
        // Select no mirror
-       transfer->current_mirror = -1;
+       transfer->mirror = -1;
 
        // Copy URL
        snprintf(transfer->url, sizeof(transfer->url) - 1, "%s", url);
@@ -478,7 +478,7 @@ ERROR:
 
 static int pakfire_transfer_select_mirror(struct pakfire_downloader* downloader,
                struct pakfire_transfer* transfer) {
-       for (unsigned int next = transfer->current_mirror + 1;
+       for (unsigned int next = transfer->mirror + 1;
                        next < downloader->num_mirrors; next++) {
                struct pakfire_mirror* mirror = downloader->mirrors[next];
 
@@ -487,7 +487,7 @@ static int pakfire_transfer_select_mirror(struct pakfire_downloader* downloader,
                        continue;
 
                DEBUG(downloader->pakfire, "Selected mirror %s\n", mirror->url);
-               transfer->current_mirror = next;
+               transfer->mirror = next;
 
                return 0;
        }
@@ -554,8 +554,8 @@ static int pakfire_transfer_fail(struct pakfire_downloader* downloader,
                return r;
 
        // Did we use a mirror?
-       if (transfer->current_mirror >= 0) {
-               struct pakfire_mirror* mirror = downloader->mirrors[transfer->current_mirror];
+       if (transfer->mirror >= 0) {
+               struct pakfire_mirror* mirror = downloader->mirrors[transfer->mirror];
 
                // Decrease retries and potentially mark mirror as broken
                if (!mirror->retries_left--) {
@@ -678,7 +678,7 @@ static int pakfire_downloader_activate_transfer(struct pakfire_downloader* downl
                if (r)
                        return r;
 
-               struct pakfire_mirror* mirror = downloader->mirrors[transfer->current_mirror];
+               struct pakfire_mirror* mirror = downloader->mirrors[transfer->mirror];
 
                char* url = pakfire_url_join(mirror->url, transfer->url);
                if (!url) {