From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 15 Apr 2021 16:08:52 +0000 (+0000)
Subject: downloader: Do not initialise cURL
X-Git-Tag: 0.9.28~1285^2~366
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc5716b49e10aa85086de0b5e0bfe92d336fa207;p=pakfire.git

downloader: Do not initialise cURL

It does that automatically

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

diff --git a/src/libpakfire/downloader.c b/src/libpakfire/downloader.c
index 0ee6f493e..7e710872a 100644
--- a/src/libpakfire/downloader.c
+++ b/src/libpakfire/downloader.c
@@ -41,12 +41,6 @@
 // The number of concurrent downloads
 #define MAX_PARALLEL			4
 
-/*
-	Count how many downloaders are using cURL and free global resources when no
-	downloaders are being left.
-*/
-static int curl_initialized = 0;
-
 struct pakfire_mirror {
 	STAILQ_ENTRY(pakfire_mirror) nodes;
 
@@ -112,15 +106,6 @@ static char* pakfire_url_join(const char* part1, const char* part2) {
 }
 
 static int pakfire_downloader_setup_curl(struct pakfire_downloader* downloader) {
-	// Globally initialise cURL
-	if (!curl_initialized++) {
-		int r = curl_global_init(CURL_GLOBAL_ALL);
-		if (r) {
-			ERROR(downloader->pakfire, "Could not setup cURL: %d\n", r);
-			return r;
-		}
-	}
-
 	// Create a new multi handle
 	downloader->curl = curl_multi_init();
 	if (!downloader->curl) {
@@ -167,10 +152,6 @@ static void pakfire_downloader_free(struct pakfire_downloader* downloader) {
 	if (downloader->curl)
 		curl_multi_cleanup(downloader->curl);
 
-	// Cleanup global stuff after all downloader instances have been freed
-	if (!--curl_initialized)
-		curl_global_cleanup();
-
 	pakfire_unref(downloader->pakfire);
 	free(downloader);
 }