]> git.ipfire.org Git - pakfire.git/commitdiff
downloader: Remove separating between protocol types when handling result
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 15 Apr 2021 16:31:49 +0000 (16:31 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 15 Apr 2021 16:31:49 +0000 (16:31 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/libpakfire/downloader.c

index b2929b09e33756a317d463e6b0490ae9db306ee0..58d9808acf4577d23534bd7627e8f58560c0e4c2 100644 (file)
@@ -435,7 +435,6 @@ static int pakfire_transfer_done(struct pakfire_downloader* downloader,
                struct pakfire_transfer* transfer, int code) {
        CURL* h = transfer->handle;
 
-       int r;
        long protocol;
        const char* url;
        long response_code;
@@ -479,40 +478,11 @@ static int pakfire_transfer_done(struct pakfire_downloader* downloader,
        if (speed)
                DEBUG(downloader->pakfire, "  Download Speed: %ld bps\n", speed);
 
-       switch (protocol) {
-               case CURLPROTO_FILE:
-                       // Handle any errors
-                       if (code)
-                               r = pakfire_transfer_fail(downloader, transfer, code);
-                       else
-                               r = pakfire_transfer_save(downloader, transfer);
-
-                       return r;
+       // Handle any errors
+       if (code)
+               return pakfire_transfer_fail(downloader, transfer, code);
 
-               case CURLPROTO_HTTPS:
-               case CURLPROTO_HTTP:
-                       switch (response_code) {
-                               // 200 - OK
-                               case 200:
-                                       r = pakfire_transfer_save(downloader, transfer);
-                                       if (r)
-                                               return r;
-                                       break;
-
-                               // Treat all other response codes as an error
-                               default:
-                                       r = pakfire_transfer_fail(downloader, transfer, code);
-                                       if (r)
-                                               return r;
-
-                                       // Error
-                                       return 1;
-                       }
-                       break;
-       }
-
-       // Success
-       return 0;
+       return pakfire_transfer_save(downloader, transfer);
 }
 
 static int pakfire_downloader_prepare_transfer(struct pakfire_downloader* downloader,