From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 15 Apr 2021 16:31:49 +0000 (+0000)
Subject: downloader: Remove separating between protocol types when handling result
X-Git-Tag: 0.9.28~1285^2~361
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4eef07222a94297d75d73aaea0d3e24946ad6cee;p=pakfire.git

downloader: Remove separating between protocol types when handling result

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

diff --git a/src/libpakfire/downloader.c b/src/libpakfire/downloader.c
index b2929b09e..58d9808ac 100644
--- a/src/libpakfire/downloader.c
+++ b/src/libpakfire/downloader.c
@@ -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,