romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-06-03 14:54:14 +03:00
Code Issues Projects Releases Packages Wiki Activity

lib: reserve 'result' for CURLcode

Browse source 
For consistency, whereever we use a local variable named 'result' that
is a CURLcode type. Make other types use other names.

Closes #21244
This commit is contained in:
Daniel Stenberg 2026-04-06 22:21:12 +02:00
parent 4cb4f9d602
commit 9f5d1a38d1
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
9 changed files with 66 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

31
lib/progress.c
View file

@ -632,18 +632,18 @@ static void progress_meter(struct Curl_easy *data)
static CURLcode pgrsupdate(struct Curl_easy *data, bool showprogress)
{
if(!data->progress.hide) {
int rc;
if(data->set.fxferinfo) {
int result;
/* There is a callback set, call that */
Curl_set_in_callback(data, TRUE);
result = data->set.fxferinfo(data->set.progress_client,
data->progress.dl.total_size,
data->progress.dl.cur_size,
data->progress.ul.total_size,
data->progress.ul.cur_size);
rc = data->set.fxferinfo(data->set.progress_client,
data->progress.dl.total_size,
data->progress.dl.cur_size,
data->progress.ul.total_size,
data->progress.ul.cur_size);
Curl_set_in_callback(data, FALSE);
if(result != CURL_PROGRESSFUNC_CONTINUE) {
if(result) {
if(rc != CURL_PROGRESSFUNC_CONTINUE) {
if(rc) {
failf(data, "Callback aborted");
return CURLE_ABORTED_BY_CALLBACK;
}
@ -651,17 +651,16 @@ static CURLcode pgrsupdate(struct Curl_easy *data, bool showprogress)
}
}
else if(data->set.fprogress) {
int result;
/* The older deprecated callback is set, call that */
Curl_set_in_callback(data, TRUE);
result = data->set.fprogress(data->set.progress_client,
(double)data->progress.dl.total_size,
(double)data->progress.dl.cur_size,
(double)data->progress.ul.total_size,
(double)data->progress.ul.cur_size);
rc = data->set.fprogress(data->set.progress_client,
(double)data->progress.dl.total_size,
(double)data->progress.dl.cur_size,
(double)data->progress.ul.total_size,
(double)data->progress.ul.cur_size);
Curl_set_in_callback(data, FALSE);
if(result != CURL_PROGRESSFUNC_CONTINUE) {
if(result) {
if(rc != CURL_PROGRESSFUNC_CONTINUE) {
if(rc) {
failf(data, "Callback aborted");
return CURLE_ABORTED_BY_CALLBACK;
}