[pacman-dev] Inline dload_payload->curlerr field into a local variable

Message ID 20200309223648.231458-1-anatol.pomozov@gmail.com
State New
Headers show
Series
  • [pacman-dev] Inline dload_payload->curlerr field into a local variable
Related show

Commit Message

Anatol Pomozov March 9, 2020, 10:36 p.m. UTC
dload_payload->curlerr is a field that is used inside
curl_download_internal() function only. It can be converted to a local
variable.

Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com>
---
 lib/libalpm/dload.c | 9 +++++----
 lib/libalpm/dload.h | 1 -
 2 files changed, 5 insertions(+), 5 deletions(-)

Comments

Allan McRae March 25, 2020, 11:02 a.m. UTC | #1
On 10/3/20 8:36 am, Anatol Pomozov wrote:
> dload_payload->curlerr is a field that is used inside
> curl_download_internal() function only. It can be converted to a local
> variable.
> 

Ack.

Patch

diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c
index 1f28c7c2..3570e234 100644
--- a/lib/libalpm/dload.c
+++ b/lib/libalpm/dload.c
@@ -366,6 +366,7 @@  static int curl_download_internal(struct dload_payload *payload,
 	long timecond, remote_time = -1;
 	double remote_size, bytes_dl;
 	struct sigaction orig_sig_pipe, orig_sig_int;
+	CURLcode curlerr;
 	/* shortcut to our handle within the payload */
 	alpm_handle_t *handle = payload->handle;
 	CURL *curl = curl_easy_init();
@@ -437,9 +438,9 @@  static int curl_download_internal(struct dload_payload *payload,
 	mask_signal(SIGINT, &inthandler, &orig_sig_int);
 
 	/* perform transfer */
-	payload->curlerr = curl_easy_perform(curl);
+	curlerr = curl_easy_perform(curl);
 	_alpm_log(handle, ALPM_LOG_DEBUG, "curl returned error %d from transfer\n",
-			payload->curlerr);
+			curlerr);
 
 	/* disconnect relationships from the curl handle for things that might go out
 	 * of scope, but could still be touched on connection teardown. This really
@@ -448,7 +449,7 @@  static int curl_download_internal(struct dload_payload *payload,
 	curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, (char *)NULL);
 
 	/* was it a success? */
-	switch(payload->curlerr) {
+	switch(curlerr) {
 		case CURLE_OK:
 			/* get http/ftp response code */
 			_alpm_log(handle, ALPM_LOG_DEBUG, "response code: %ld\n", payload->respcode);
@@ -469,7 +470,7 @@  static int curl_download_internal(struct dload_payload *payload,
 		case CURLE_ABORTED_BY_CALLBACK:
 			/* handle the interrupt accordingly */
 			if(dload_interrupted == ABORT_OVER_MAXFILESIZE) {
-				payload->curlerr = CURLE_FILESIZE_EXCEEDED;
+				curlerr = CURLE_FILESIZE_EXCEEDED;
 				payload->unlink_on_fail = 1;
 				handle->pm_errno = ALPM_ERR_LIBCURL;
 				_alpm_log(handle, ALPM_LOG_ERROR,
diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h
index 65fcdadb..e87b6a93 100644
--- a/lib/libalpm/dload.h
+++ b/lib/libalpm/dload.h
@@ -45,7 +45,6 @@  struct dload_payload {
 	int cb_initialized;
 #ifdef HAVE_LIBCURL
 	CURL *curl;
-	CURLcode curlerr;       /* last error produced by curl */
 #endif
 };