From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 1 Feb 2025 13:56:07 +0000 (+0000)
Subject: httpclient: Shorten some function names
X-Git-Tag: 0.9.30~203
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04a0c0003e669c0141b4089416e3dca17da1c925;p=pakfire.git

httpclient: Shorten some function names

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

diff --git a/src/pakfire/daemon.c b/src/pakfire/daemon.c
index fcb55408..94a3307e 100644
--- a/src/pakfire/daemon.c
+++ b/src/pakfire/daemon.c
@@ -719,7 +719,7 @@ static int pakfire_daemon_connect(sd_event_source* s, uint64_t usec, void* data)
 		goto ERROR;
 
 	// Enqueue the transfer
-	r = pakfire_httpclient_enqueue_xfer(daemon->client, xfer);
+	r = pakfire_httpclient_enqueue(daemon->client, xfer);
 	if (r)
 		goto ERROR;
 
diff --git a/src/pakfire/httpclient.c b/src/pakfire/httpclient.c
index f7e61a1c..19a257f1 100644
--- a/src/pakfire/httpclient.c
+++ b/src/pakfire/httpclient.c
@@ -285,7 +285,7 @@ static int pakfire_httpclient_check(struct pakfire_httpclient* self) {
 				}
 
 				// Remove the xfer from the queue
-				pakfire_httpclient_dequeue_xfer(self, xfer);
+				pakfire_httpclient_dequeue(self, xfer);
 
 				// Reset transfer
 				xfer = NULL;
@@ -679,8 +679,7 @@ struct pakfire_httpclient* pakfire_httpclient_unref(struct pakfire_httpclient* s
 	return NULL;
 }
 
-int pakfire_httpclient_enqueue_xfer(struct pakfire_httpclient* self,
-		struct pakfire_xfer* xfer) {
+int pakfire_httpclient_enqueue(struct pakfire_httpclient* self, struct pakfire_xfer* xfer) {
 	struct pakfire_httpclient_xfer* e = NULL;
 	int r;
 
@@ -698,8 +697,7 @@ int pakfire_httpclient_enqueue_xfer(struct pakfire_httpclient* self,
 	return 0;
 }
 
-int pakfire_httpclient_dequeue_xfer(struct pakfire_httpclient* self,
-		struct pakfire_xfer* xfer) {
+int pakfire_httpclient_dequeue(struct pakfire_httpclient* self, struct pakfire_xfer* xfer) {
 	struct pakfire_httpclient_xfer* e = NULL;
 	int r;
 
diff --git a/src/pakfire/httpclient.h b/src/pakfire/httpclient.h
index 43be000c..9f09123f 100644
--- a/src/pakfire/httpclient.h
+++ b/src/pakfire/httpclient.h
@@ -35,10 +35,8 @@ int pakfire_httpclient_create(struct pakfire_httpclient** client,
 struct pakfire_httpclient* pakfire_httpclient_ref(struct pakfire_httpclient* self);
 struct pakfire_httpclient* pakfire_httpclient_unref(struct pakfire_httpclient* self);
 
-int pakfire_httpclient_enqueue_xfer(
-	struct pakfire_httpclient* self, struct pakfire_xfer* xfer);
-int pakfire_httpclient_dequeue_xfer(
-	struct pakfire_httpclient* self, struct pakfire_xfer* xfer);
+int pakfire_httpclient_enqueue(struct pakfire_httpclient* self, struct pakfire_xfer* xfer);
+int pakfire_httpclient_dequeue(struct pakfire_httpclient* self, struct pakfire_xfer* xfer);
 
 int pakfire_httpclient_run(struct pakfire_httpclient* self, const char* title);
 
diff --git a/src/pakfire/job.c b/src/pakfire/job.c
index 1b75d4eb..642c8422 100644
--- a/src/pakfire/job.c
+++ b/src/pakfire/job.c
@@ -984,7 +984,7 @@ static int pakfire_job_connect(sd_event_source* s, uint64_t usec, void* data) {
 		goto ERROR;
 
 	// Enqueue the transfer
-	r = pakfire_httpclient_enqueue_xfer(client, xfer);
+	r = pakfire_httpclient_enqueue(client, xfer);
 	if (r)
 		goto ERROR;
 
diff --git a/src/pakfire/transaction.c b/src/pakfire/transaction.c
index 03899a79..577666da 100644
--- a/src/pakfire/transaction.c
+++ b/src/pakfire/transaction.c
@@ -1910,7 +1910,7 @@ static int pakfire_transaction_download_package(struct pakfire_transaction* tran
 		goto ERROR;
 
 	// Enqueue the transfer
-	r = pakfire_httpclient_enqueue_xfer(httpclient, xfer);
+	r = pakfire_httpclient_enqueue(httpclient, xfer);
 	if (r)
 		goto ERROR;
 
diff --git a/tests/libpakfire/httpclient.c b/tests/libpakfire/httpclient.c
index d794d69b..b4dadf82 100644
--- a/tests/libpakfire/httpclient.c
+++ b/tests/libpakfire/httpclient.c
@@ -56,7 +56,7 @@ static int test_one(const struct test* t) {
 	ASSERT_SUCCESS(pakfire_xfer_set_output_buffer(xfer, &buffer, &length));
 
 	// Enqueue the transfer
-	ASSERT_SUCCESS(pakfire_httpclient_enqueue_xfer(t->httpclient, xfer));
+	ASSERT_SUCCESS(pakfire_httpclient_enqueue(t->httpclient, xfer));
 
 	// Run it!
 	ASSERT_SUCCESS(pakfire_httpclient_run(t->httpclient, "Downloading..."));
@@ -94,7 +94,7 @@ static int __test_create_transfer(const struct test* t, struct pakfire_xfer** xf
 		goto ERROR;
 
 	// Enqueue the transfer
-	r = pakfire_httpclient_enqueue_xfer(t->httpclient, *xfer);
+	r = pakfire_httpclient_enqueue(t->httpclient, *xfer);
 	if (r)
 		goto ERROR;