]> git.ipfire.org Git - pakfire.git/commitdiff
downloader: Do not initialise cURL
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 15 Apr 2021 16:08:52 +0000 (16:08 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 15 Apr 2021 16:08:52 +0000 (16:08 +0000)
It does that automatically

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/libpakfire/downloader.c

index 0ee6f493e0b4bc03cf45c894e2713564164b2ea7..7e710872a7a47954db7110a5d05420b5a2205256 100644 (file)
 // 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);
 }