mirror of
https://github.com/curl/curl.git
synced 2026-04-15 01:01:41 +03:00
tidy-up: miscellaneous
- tool_bname: scope an include. - `endif` comments. - Markdown fixes. - comment tidy-ups. - whitespace, newlines, indent. Closes #20309
This commit is contained in:
parent
62ba3604dc
commit
ac6264366f
98 changed files with 829 additions and 863 deletions
31
lib/multi.c
31
lib/multi.c
|
|
@ -517,8 +517,8 @@ CURLMcode curl_multi_add_handle(CURLM *m, CURL *d)
|
|||
data->set.server_response_timeout;
|
||||
multi->admin->set.no_signal = data->set.no_signal;
|
||||
|
||||
CURL_TRC_M(data, "added to multi, mid=%u, running=%u"
|
||||
", total=%u", data->mid, Curl_multi_xfers_running(multi),
|
||||
CURL_TRC_M(data, "added to multi, mid=%u, running=%u, total=%u",
|
||||
data->mid, Curl_multi_xfers_running(multi),
|
||||
Curl_uint32_tbl_count(&multi->xfers));
|
||||
return CURLM_OK;
|
||||
}
|
||||
|
|
@ -611,8 +611,7 @@ static void multi_done_locked(struct connectdata *conn,
|
|||
CURL_TRC_M(data, "multi_done_locked, in use=%u", conn->attached_xfers);
|
||||
if(CONN_INUSE(conn)) {
|
||||
/* Stop if still used. */
|
||||
CURL_TRC_M(data,
|
||||
"Connection still in use %u, no more multi_done now!",
|
||||
CURL_TRC_M(data, "Connection still in use %u, no more multi_done now!",
|
||||
conn->attached_xfers);
|
||||
return;
|
||||
}
|
||||
|
|
@ -885,8 +884,8 @@ CURLMcode curl_multi_remove_handle(CURLM *m, CURL *d)
|
|||
return mresult;
|
||||
}
|
||||
|
||||
CURL_TRC_M(data, "removed from multi, mid=%u, running=%u"
|
||||
", total=%u", mid, Curl_multi_xfers_running(multi),
|
||||
CURL_TRC_M(data, "removed from multi, mid=%u, running=%u, total=%u",
|
||||
mid, Curl_multi_xfers_running(multi),
|
||||
Curl_uint32_tbl_count(&multi->xfers));
|
||||
return CURLM_OK;
|
||||
}
|
||||
|
|
@ -2710,19 +2709,17 @@ statemachine_end:
|
|||
/* A sub transfer, not for msgsent to application */
|
||||
struct Curl_easy *mdata;
|
||||
|
||||
CURL_TRC_M(data, "sub xfer done for master %u",
|
||||
data->master_mid);
|
||||
CURL_TRC_M(data, "sub xfer done for master %u", data->master_mid);
|
||||
mdata = Curl_multi_get_easy(multi, data->master_mid);
|
||||
if(mdata) {
|
||||
if(mdata->sub_xfer_done)
|
||||
mdata->sub_xfer_done(mdata, data, result);
|
||||
else
|
||||
CURL_TRC_M(data, "master easy %u"
|
||||
" without sub_xfer_done callback.", data->master_mid);
|
||||
CURL_TRC_M(data, "master easy %u without sub_xfer_done callback.",
|
||||
data->master_mid);
|
||||
}
|
||||
else {
|
||||
CURL_TRC_M(data, "master easy %u already gone.",
|
||||
data->master_mid);
|
||||
CURL_TRC_M(data, "master easy %u already gone.", data->master_mid);
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
|
@ -3119,8 +3116,7 @@ static CURLMcode multi_run_dirty(struct multi_run_ctx *mrc)
|
|||
}
|
||||
}
|
||||
else {
|
||||
CURL_TRC_M(multi->admin,
|
||||
"multi_run_dirty, %u no longer found", mid);
|
||||
CURL_TRC_M(multi->admin, "multi_run_dirty, %u no longer found", mid);
|
||||
Curl_uint32_bset_remove(&multi->dirty, mid);
|
||||
}
|
||||
} while(Curl_uint32_bset_next(&multi->dirty, mid, &mid));
|
||||
|
|
@ -3342,8 +3338,7 @@ static bool multi_has_dirties(struct Curl_multi *multi)
|
|||
Curl_uint32_bset_remove(&multi->dirty, mid);
|
||||
}
|
||||
else {
|
||||
CURL_TRC_M(multi->admin, "dirty transfer %u no longer found",
|
||||
mid);
|
||||
CURL_TRC_M(multi->admin, "dirty transfer %u no longer found", mid);
|
||||
Curl_uint32_bset_remove(&multi->dirty, mid);
|
||||
}
|
||||
} while(Curl_uint32_bset_next(&multi->dirty, mid, &mid));
|
||||
|
|
@ -3986,8 +3981,8 @@ struct Curl_easy *Curl_multi_get_easy(struct Curl_multi *multi,
|
|||
struct Curl_easy *data = Curl_uint32_tbl_get(&multi->xfers, mid);
|
||||
if(data && GOOD_EASY_HANDLE(data))
|
||||
return data;
|
||||
CURL_TRC_M(multi->admin,
|
||||
"invalid easy handle in xfer table for mid=%u", mid);
|
||||
CURL_TRC_M(multi->admin, "invalid easy handle in xfer table for mid=%u",
|
||||
mid);
|
||||
Curl_uint32_tbl_remove(&multi->xfers, mid);
|
||||
return NULL;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue