diff options
| author | Anatol Pomozov <anatol.pomozov@gmail.com> | 2020-03-09 23:36:48 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2020-05-09 03:58:21 +0200 |
| commit | fa68c33fa821cd7ddc5ae32baf62af2a238e44dc (patch) | |
| tree | 44096bdae0be271e09a6367fa2518c02b96a9f13 | |
| parent | dc98d0ea09f3632cd28a12099f3f09d466dcad1d (diff) | |
| download | pacman-fa68c33fa821cd7ddc5ae32baf62af2a238e44dc.tar.gz pacman-fa68c33fa821cd7ddc5ae32baf62af2a238e44dc.tar.xz | |
Inline dload_payload->curlerr field into a local variable
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>
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | lib/libalpm/dload.c | 9 | ||||
| -rw-r--r-- | lib/libalpm/dload.h | 1 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 71b26d23..4c81b11f 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(); @@ -436,9 +437,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 @@ -447,7 +448,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); @@ -468,7 +469,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 }; |