From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 11 Mar 2021 16:45:06 +0000 (+0000)
Subject: downloader: Shorten name of transfer struct
X-Git-Tag: 0.9.28~1285^2~568
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2808d5a4f0699e1cbc28849163e7ce90b0679727;p=pakfire.git

downloader: Shorten name of transfer struct

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

diff --git a/src/libpakfire/downloader.c b/src/libpakfire/downloader.c
index 187ad8ee8..c9ddba40a 100644
--- a/src/libpakfire/downloader.c
+++ b/src/libpakfire/downloader.c
@@ -45,8 +45,8 @@ struct pakfire_mirror {
 	unsigned int priority;
 };
 
-struct pakfire_downloader_transfer {
-	TAILQ_ENTRY(pakfire_downloader_transfer) nodes;
+struct pakfire_transfer {
+	TAILQ_ENTRY(pakfire_transfer) nodes;
 
 	CURL* handle;
 
@@ -66,7 +66,7 @@ struct pakfire_downloader {
 
 	// cURL multi handle
 	CURLM* curl;
-	TAILQ_HEAD(transfers, pakfire_downloader_transfer) transfers;
+	TAILQ_HEAD(transfers, pakfire_transfer) transfers;
 
 	// Mirror stuff
 	char baseurl[PATH_MAX];
@@ -97,7 +97,7 @@ static int pakfire_downloader_setup_curl(struct pakfire_downloader* downloader)
 	return 0;
 }
 
-static void pakfire_downloader_transfer_free(struct pakfire_downloader_transfer* transfer) {
+static void pakfire_transfer_free(struct pakfire_transfer* transfer) {
 	if (transfer->handle)
 		curl_easy_cleanup(transfer->handle);
 
@@ -119,9 +119,9 @@ static void pakfire_downloader_free(struct pakfire_downloader* downloader) {
 		curl_global_cleanup();
 
 	// Free any unprocessed transfers
-	struct pakfire_downloader_transfer* transfer;
+	struct pakfire_transfer* transfer;
 	TAILQ_FOREACH(transfer, &downloader->transfers, nodes)
-		pakfire_downloader_transfer_free(transfer);
+		pakfire_transfer_free(transfer);
 
 	// Free mirrors
 	if (downloader->mirrors) {
@@ -263,9 +263,9 @@ static int debug_callback(CURL *handle, curl_infotype type,
 }
 #endif
 
-static struct pakfire_downloader_transfer* pakfire_downloader_create_transfer(
+static struct pakfire_transfer* pakfire_downloader_create_transfer(
 		struct pakfire_downloader* downloader, const char* path) {
-	struct pakfire_downloader_transfer* transfer = calloc(1, sizeof(*transfer));
+	struct pakfire_transfer* transfer = calloc(1, sizeof(*transfer));
 	if (!transfer)
 		return NULL;
 
@@ -307,13 +307,13 @@ static struct pakfire_downloader_transfer* pakfire_downloader_create_transfer(
 	return transfer;
 
 ERROR:
-	pakfire_downloader_transfer_free(transfer);
+	pakfire_transfer_free(transfer);
 
 	return NULL;
 }
 
-static int pakfire_downloader_transfer_done(struct pakfire_downloader* downloader,
-		struct pakfire_downloader_transfer* transfer, CURLMsg* msg) {
+static int pakfire_transfer_done(struct pakfire_downloader* downloader,
+		struct pakfire_transfer* transfer, CURLMsg* msg) {
 	int r;
 
 	DEBUG(downloader->pakfire, "cURL transfer done: %d - %s\n",
@@ -334,7 +334,7 @@ int pakfire_downloader_add(struct pakfire_downloader* downloader,
 		const char* url, const char* path) {
 	DEBUG(downloader->pakfire, "Adding download of %s\n", url);
 
-	struct pakfire_downloader_transfer* transfer =
+	struct pakfire_transfer* transfer =
 		pakfire_downloader_create_transfer(downloader, path);
 	if (!transfer)
 		return 1;
@@ -351,14 +351,14 @@ int pakfire_downloader_add(struct pakfire_downloader* downloader,
 	int r = curl_multi_add_handle(downloader->curl, transfer->handle);
 	if (r) {
 		ERROR(downloader->pakfire, "Adding handler failed\n");
-		pakfire_downloader_transfer_free(transfer);
+		pakfire_transfer_free(transfer);
 	}
 
 	return r;
 }
 
 int pakfire_downloader_run(struct pakfire_downloader* downloader) {
-	struct pakfire_downloader_transfer* transfer;
+	struct pakfire_transfer* transfer;
 	unsigned int transfers = 0;
 
 	int r;
@@ -375,7 +375,7 @@ int pakfire_downloader_run(struct pakfire_downloader* downloader) {
 			r = curl_multi_add_handle(downloader->curl, transfer->handle);
 			if (r) {
 				ERROR(downloader->pakfire, "Adding handler failed\n");
-				pakfire_downloader_transfer_free(transfer);
+				pakfire_transfer_free(transfer);
 			}
 
 			transfers++;
@@ -392,11 +392,11 @@ int pakfire_downloader_run(struct pakfire_downloader* downloader) {
 				curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE, &transfer);
 
 				// Handle whatever comes after the transfer
-				pakfire_downloader_transfer_done(downloader, transfer, msg);
+				pakfire_transfer_done(downloader, transfer, msg);
 
 				// Remove and destroy the handle
 				curl_multi_remove_handle(downloader->curl, transfer->handle);
-				pakfire_downloader_transfer_free(transfer);
+				pakfire_transfer_free(transfer);
 
 			// Log any other messages
 			} else {