romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-25 16:47:16 +03:00
Code Issues Projects Releases Packages Wiki Activity

multi: use CURLMNOTIFY_ as notification id prefix

Browse source 
Since CURLM_ is already used as prefix for multi error codes, it makes
it easier to detect and understand the difference between identifiers -
and allows for scripts on the website and elsewhere to separate them
properly.

Follow-up to 53be8166b2
Closes #18912
This commit is contained in:
Daniel Stenberg 2025-10-07 16:00:59 +02:00
parent 6bb7714032
commit 496802fdcf
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
9 changed files with 31 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/libcurl/curl_multi_notify_disable.md
View file

@ -49,7 +49,7 @@ int main(void)
int rc;
CURLM *multi = curl_multi_init();
rc = curl_multi_notify_disable(multi, CURLM_NOTIFY_INFO_READ);
rc = curl_multi_notify_disable(multi, CURLMNOTIFY_INFO_READ);
}
~~~

2
docs/libcurl/curl_multi_notify_enable.md
View file

@ -49,7 +49,7 @@ int main(void)
int rc;
CURLM *multi = curl_multi_init();
rc = curl_multi_notify_enable(multi, CURLM_NOTIFY_INFO_READ);
rc = curl_multi_notify_enable(multi, CURLMNOTIFY_INFO_READ);
}
~~~

2
docs/libcurl/opts/CURLMOPT_NOTIFYDATA.md
View file

@ -61,7 +61,7 @@ int main(void)
/* ... use socket callback and custom pointer */
curl_multi_setopt(multi, CURLMOPT_NOTIFYFUNCTION, ntfy_cb);
curl_multi_setopt(multi, CURLMOPT_NOTIFYDATA, &setup);
curl_multi_notify_enable(multi, CURLM_NOTIFY_INFO_READ);
curl_multi_notify_enable(multi, CURLMNOTIFY_INFO_READ);
}
~~~

6
docs/libcurl/opts/CURLMOPT_NOTIFYFUNCTION.md
View file

@ -63,7 +63,7 @@ are shut down.
**notification** is the type of notification, e.g. what happened. The
following types are available:
## CURLM_NOTIFY_INFO_READ
## CURLMNOTIFY_INFO_READ
When enabled via curl_multi_notify_enable(3), this informs the application
that there are new messages to be processed via curl_multi_info_read(3).
@ -76,7 +76,7 @@ again.
The *easy* handle passed is an internal handle.
## CURLM_NOTIFY_EASY_DONE
## CURLMNOTIFY_EASY_DONE
When enabled via curl_multi_notify_enable(3), this notification is triggered
when a an easy handle has finished. This happens both for
@ -118,7 +118,7 @@ int main(void)
/* ... use socket callback and custom pointer */
curl_multi_setopt(multi, CURLMOPT_NOTIFYFUNCTION, ntfy_cb);
curl_multi_setopt(multi, CURLMOPT_NOTIFYDATA, &setup);
curl_multi_notify_enable(multi, CURLM_NOTIFY_INFO_READ);
curl_multi_notify_enable(multi, CURLMNOTIFY_INFO_READ);
}
~~~

30
docs/libcurl/symbols-in-versions
View file

@ -234,6 +234,7 @@ CURLE_CONV_REQD 7.15.4 7.82.0
CURLE_COULDNT_CONNECT 7.1
CURLE_COULDNT_RESOLVE_HOST 7.1
CURLE_COULDNT_RESOLVE_PROXY 7.1
CURLE_ECH_REQUIRED 8.8.0
CURLE_FAILED_INIT 7.1
CURLE_FILE_COULDNT_READ_FILE 7.1
CURLE_FILESIZE_EXCEEDED 7.10.8
@ -337,7 +338,6 @@ CURLE_UNRECOVERABLE_POLL 7.84.0
CURLE_UNSUPPORTED_PROTOCOL 7.1
CURLE_UPLOAD_FAILED 7.16.3
CURLE_URL_MALFORMAT 7.1
CURLE_ECH_REQUIRED 8.8.0
CURLE_URL_MALFORMAT_USER 7.1 7.17.0
CURLE_USE_SSL_FAILED 7.17.0
CURLE_WEIRD_SERVER_REPLY 7.51.0
@ -360,8 +360,8 @@ CURLFINFOFLAG_KNOWN_SIZE 7.21.0
CURLFINFOFLAG_KNOWN_TIME 7.21.0
CURLFINFOFLAG_KNOWN_UID 7.21.0
CURLFOLLOW_ALL 8.13.0
CURLFOLLOW_OBEYCODE 8.13.0
CURLFOLLOW_FIRSTONLY 8.13.0
CURLFOLLOW_OBEYCODE 8.13.0
CURLFORM_ARRAY 7.9.1 7.56.0
CURLFORM_ARRAY_END 7.9.1 7.9.5 7.9.6
CURLFORM_ARRAY_START 7.9.1 7.9.5 7.9.6
@ -466,9 +466,9 @@ CURLINFO_NONE 7.4.1
CURLINFO_NUM_CONNECTS 7.12.3
CURLINFO_OFF_T 7.55.0
CURLINFO_OS_ERRNO 7.12.2
CURLINFO_POSTTRANSFER_TIME_T 8.10.0
CURLINFO_PRETRANSFER_TIME 7.4.1
CURLINFO_PRETRANSFER_TIME_T 7.61.0
CURLINFO_POSTTRANSFER_TIME_T 8.10.0
CURLINFO_PRIMARY_IP 7.19.0
CURLINFO_PRIMARY_PORT 7.21.0
CURLINFO_PRIVATE 7.10.3
@ -545,8 +545,6 @@ CURLM_BAD_SOCKET 7.15.4
CURLM_CALL_MULTI_PERFORM 7.9.6
CURLM_CALL_MULTI_SOCKET 7.15.5
CURLM_INTERNAL_ERROR 7.9.6
CURLM_NOTIFY_EASY_DONE 8.17.0
CURLM_NOTIFY_INFO_READ 8.17.0
CURLM_OK 7.9.6
CURLM_OUT_OF_MEMORY 7.9.6
CURLM_RECURSIVE_API_CALL 7.59.0
@ -560,6 +558,8 @@ CURLMINFO_XFERS_CURRENT 8.16.0
CURLMINFO_XFERS_DONE 8.16.0
CURLMINFO_XFERS_PENDING 8.16.0
CURLMINFO_XFERS_RUNNING 8.16.0
CURLMNOTIFY_EASY_DONE 8.17.0
CURLMNOTIFY_INFO_READ 8.17.0
CURLMNWC_CLEAR_CONNS 8.16.0
CURLMNWC_CLEAR_DNS 8.16.0
CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE 7.30.0
@ -594,10 +594,10 @@ CURLOPT_APPEND 7.17.0
CURLOPT_AUTOREFERER 7.1
CURLOPT_AWS_SIGV4 7.75.0
CURLOPT_BUFFERSIZE 7.10
CURLOPT_CA_CACHE_TIMEOUT 7.87.0
CURLOPT_CAINFO 7.4.2
CURLOPT_CAINFO_BLOB 7.77.0
CURLOPT_CAPATH 7.9.8
CURLOPT_CA_CACHE_TIMEOUT 7.87.0
CURLOPT_CERTINFO 7.19.1
CURLOPT_CHUNK_BGN_FUNCTION 7.21.0
CURLOPT_CHUNK_DATA 7.21.0
@ -670,8 +670,8 @@ CURLOPT_FTPPORT 7.1
CURLOPT_FTPSSLAUTH 7.12.2
CURLOPT_GSSAPI_DELEGATION 7.22.0
CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS 7.59.0
CURLOPT_HAPROXYPROTOCOL 7.60.0
CURLOPT_HAPROXY_CLIENT_IP 8.2.0
CURLOPT_HAPROXYPROTOCOL 7.60.0
CURLOPT_HEADER 7.1
CURLOPT_HEADERDATA 7.10
CURLOPT_HEADERFUNCTION 7.7.2
@ -719,7 +719,6 @@ CURLOPT_MAIL_FROM 7.20.0
CURLOPT_MAIL_RCPT 7.20.0
CURLOPT_MAIL_RCPT_ALLLOWFAILS 7.69.0 8.2.0
CURLOPT_MAIL_RCPT_ALLOWFAILS 8.2.0
CURLOPT_QUICK_EXIT 7.87.0
CURLOPT_MAX_RECV_SPEED_LARGE 7.15.5
CURLOPT_MAX_SEND_SPEED_LARGE 7.15.5
CURLOPT_MAXAGE_CONN 7.65.0
@ -800,6 +799,7 @@ CURLOPT_PROXYTYPE 7.10
CURLOPT_PROXYUSERNAME 7.19.1
CURLOPT_PROXYUSERPWD 7.1
CURLOPT_PUT 7.1 7.12.1
CURLOPT_QUICK_EXIT 7.87.0
CURLOPT_QUOTE 7.1
CURLOPT_RANDOM_FILE 7.7 7.84.0
CURLOPT_RANGE 7.1
@ -884,9 +884,9 @@ CURLOPT_STREAM_WEIGHT 7.46.0
CURLOPT_SUPPRESS_CONNECT_HEADERS 7.54.0
CURLOPT_TCP_FASTOPEN 7.49.0
CURLOPT_TCP_KEEPALIVE 7.25.0
CURLOPT_TCP_KEEPCNT 8.9.0
CURLOPT_TCP_KEEPIDLE 7.25.0
CURLOPT_TCP_KEEPINTVL 7.25.0
CURLOPT_TCP_KEEPCNT 8.9.0
CURLOPT_TCP_NODELAY 7.11.2
CURLOPT_TELNETOPTIONS 7.7
CURLOPT_TFTP_BLKSIZE 7.19.4
@ -1072,11 +1072,11 @@ CURLSSLBACKEND_SECURETRANSPORT 7.64.1 8.15.0
CURLSSLBACKEND_WOLFSSL 7.49.0
CURLSSLOPT_ALLOW_BEAST 7.25.0
CURLSSLOPT_AUTO_CLIENT_CERT 7.77.0
CURLSSLOPT_EARLYDATA 8.11.0
CURLSSLOPT_NATIVE_CA 7.71.0
CURLSSLOPT_NO_PARTIALCHAIN 7.68.0
CURLSSLOPT_NO_REVOKE 7.44.0
CURLSSLOPT_REVOKE_BEST_EFFORT 7.70.0
CURLSSLOPT_EARLYDATA 8.11.0
CURLSSLSET_NO_BACKENDS 7.56.0
CURLSSLSET_OK 7.56.0
CURLSSLSET_TOO_LATE 7.56.0
@ -1132,6 +1132,11 @@ CURLUE_UNKNOWN_PART 7.62.0
CURLUE_UNSUPPORTED_SCHEME 7.62.0
CURLUE_URLDECODE 7.62.0
CURLUE_USER_NOT_ALLOWED 7.62.0
CURLULFLAG_ANSWERED 8.13.0
CURLULFLAG_DELETED 8.13.0
CURLULFLAG_DRAFT 8.13.0
CURLULFLAG_FLAGGED 8.13.0
CURLULFLAG_SEEN 8.13.0
CURLUPART_FRAGMENT 7.62.0
CURLUPART_HOST 7.62.0
CURLUPART_OPTIONS 7.62.0
@ -1143,11 +1148,6 @@ CURLUPART_SCHEME 7.62.0
CURLUPART_URL 7.62.0
CURLUPART_USER 7.62.0
CURLUPART_ZONEID 7.65.0
CURLULFLAG_ANSWERED 8.13.0
CURLULFLAG_DELETED 8.13.0
CURLULFLAG_DRAFT 8.13.0
CURLULFLAG_FLAGGED 8.13.0
CURLULFLAG_SEEN 8.13.0
CURLUSESSL_ALL 7.17.0
CURLUSESSL_CONTROL 7.17.0
CURLUSESSL_NONE 7.17.0

5
include/curl/multi.h
View file

@ -529,8 +529,8 @@ CURL_EXTERN CURLMcode curl_multi_waitfds(CURLM *multi,
/*
* Notifications dispatched by a multi handle, when enabled.
*/
#define CURLM_NOTIFY_INFO_READ 0
#define CURLM_NOTIFY_EASY_DONE 1
#define CURLMNOTIFY_INFO_READ 0
#define CURLMNOTIFY_EASY_DONE 1
/*
* Callback to install via CURLMOPT_NOTIFYFUNCTION.
@ -540,7 +540,6 @@ typedef void (*curl_notify_callback)(CURLM *multi,
CURL *easy,
void *user_data);
CURL_EXTERN CURLMcode curl_multi_notify_disable(CURLM *multi,
unsigned int notification);

6
lib/multi.c
View file

@ -173,13 +173,13 @@ static void mstate(struct Curl_easy *data, CURLMstate state
data->mstate = state;
switch(state) {
case MSTATE_DONE:
CURLM_NTFY(data, CURLM_NOTIFY_EASY_DONE);
CURLM_NTFY(data, CURLMNOTIFY_EASY_DONE);
break;
case MSTATE_COMPLETED:
/* we sometimes directly jump to COMPLETED, trigger also a notification
* in that case. */
if(oldstate < MSTATE_DONE)
CURLM_NTFY(data, CURLM_NOTIFY_EASY_DONE);
CURLM_NTFY(data, CURLMNOTIFY_EASY_DONE);
/* changing to COMPLETED means it is in process and needs to go */
DEBUGASSERT(Curl_uint_bset_contains(&data->multi->process, data->mid));
Curl_uint_bset_remove(&data->multi->process, data->mid);
@ -226,7 +226,7 @@ static void ph_freeentry(void *p)
static void multi_addmsg(struct Curl_multi *multi, struct Curl_message *msg)
{
if(!Curl_llist_count(&multi->msglist))
CURLM_NTFY(multi->admin, CURLM_NOTIFY_INFO_READ);
CURLM_NTFY(multi->admin, CURLMNOTIFY_INFO_READ);
Curl_llist_append(&multi->msglist, msg, &msg->list);
}

6
lib/multi_ntfy.c
View file

@ -137,7 +137,7 @@ void Curl_mntfy_init(struct Curl_multi *multi)
CURLMcode Curl_mntfy_resize(struct Curl_multi *multi)
{
if(Curl_uint_bset_resize(&multi->ntfy.enabled, CURLM_NOTIFY_EASY_DONE + 1))
if(Curl_uint_bset_resize(&multi->ntfy.enabled, CURLMNOTIFY_EASY_DONE + 1))
return CURLM_OUT_OF_MEMORY;
return CURLM_OK;
}
@ -155,7 +155,7 @@ void Curl_mntfy_cleanup(struct Curl_multi *multi)
CURLMcode Curl_mntfy_enable(struct Curl_multi *multi, unsigned int type)
{
if(type > CURLM_NOTIFY_EASY_DONE)
if(type > CURLMNOTIFY_EASY_DONE)
return CURLM_UNKNOWN_OPTION;
Curl_uint_bset_add(&multi->ntfy.enabled, type);
return CURLM_OK;
@ -163,7 +163,7 @@ CURLMcode Curl_mntfy_enable(struct Curl_multi *multi, unsigned int type)
CURLMcode Curl_mntfy_disable(struct Curl_multi *multi, unsigned int type)
{
if(type > CURLM_NOTIFY_EASY_DONE)
if(type > CURLMNOTIFY_EASY_DONE)
return CURLM_UNKNOWN_OPTION;
Curl_uint_bset_remove(&multi->ntfy.enabled, type);
return CURLM_OK;

4
src/tool_operate.c
View file

@ -1736,7 +1736,7 @@ static void mnotify(CURLM *multi, unsigned int notification,
(void)easy;
switch(notification) {
case CURLM_NOTIFY_INFO_READ:
case CURLMNOTIFY_INFO_READ:
result = check_finished(s);
/* remember first failure */
if(result && !s->result)
@ -1766,7 +1766,7 @@ static CURLcode parallel_transfers(CURLSH *share)
(void)curl_multi_setopt(s->multi, CURLMOPT_NOTIFYFUNCTION, mnotify);
(void)curl_multi_setopt(s->multi, CURLMOPT_NOTIFYDATA, s);
(void)curl_multi_notify_enable(s->multi, CURLM_NOTIFY_INFO_READ);
(void)curl_multi_notify_enable(s->multi, CURLMNOTIFY_INFO_READ);
result = add_parallel_transfers(s->multi, s->share,
&s->more_transfers, &s->added_transfers);