From d21f4372ffff7487a8df01577e0c55a01319b32a Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 16 Dec 2025 13:47:45 +0100 Subject: [PATCH] docs: use mresult as variable name for CURLMcode --- docs/examples/ephiperfifo.c | 20 ++++++++++---------- docs/examples/evhiperfifo.c | 18 +++++++++--------- docs/examples/ghiper.c | 18 +++++++++--------- docs/examples/hiperfifo.c | 18 +++++++++--------- docs/examples/http2-download.c | 6 +++--- docs/examples/http2-pushinmemory.c | 8 ++++---- docs/examples/http2-serverpush.c | 6 +++--- docs/examples/http2-upload.c | 6 +++--- docs/examples/imap-multi.c | 6 +++--- docs/examples/multi-app.c | 6 +++--- docs/examples/multi-debugcallback.c | 6 +++--- docs/examples/multi-double.c | 6 +++--- docs/examples/multi-formadd.c | 6 +++--- docs/examples/multi-legacy.c | 8 ++++---- docs/examples/multi-post.c | 6 +++--- docs/examples/multi-single.c | 10 +++++----- docs/examples/pop3-multi.c | 6 +++--- docs/examples/smtp-multi.c | 6 +++--- docs/libcurl/curl_multi_assign.md | 6 +++--- docs/libcurl/curl_multi_fdset.md | 10 +++++----- docs/libcurl/curl_multi_perform.md | 10 +++++----- docs/libcurl/curl_multi_poll.md | 12 ++++++------ docs/libcurl/curl_multi_socket_action.md | 6 +++--- docs/libcurl/curl_multi_strerror.md | 6 +++--- docs/libcurl/curl_multi_wait.md | 12 ++++++------ docs/libcurl/curl_multi_waitfds.md | 16 ++++++++-------- docs/libcurl/curl_multi_wakeup.md | 8 ++++---- 27 files changed, 126 insertions(+), 126 deletions(-) diff --git a/docs/examples/ephiperfifo.c b/docs/examples/ephiperfifo.c index 14a3817538..2c06d225bb 100644 --- a/docs/examples/ephiperfifo.c +++ b/docs/examples/ephiperfifo.c @@ -201,14 +201,14 @@ static void check_multi_info(struct GlobalInfo *g) /* Called by libevent when we get action on a multi socket filedescriptor */ static void event_cb(struct GlobalInfo *g, int fd, int revents) { - CURLMcode rc; + CURLMcode mresult; struct itimerspec its; int action = ((revents & EPOLLIN) ? CURL_CSELECT_IN : 0) | - ((revents & EPOLLOUT) ? CURL_CSELECT_OUT : 0); + ((revents & EPOLLOUT) ? CURL_CSELECT_OUT : 0); - rc = curl_multi_socket_action(g->multi, fd, action, &g->still_running); - mcode_or_die("event_cb: curl_multi_socket_action", rc); + mresult = curl_multi_socket_action(g->multi, fd, action, &g->still_running); + mcode_or_die("event_cb: curl_multi_socket_action", mresult); check_multi_info(g); if(g->still_running <= 0) { @@ -221,7 +221,7 @@ static void event_cb(struct GlobalInfo *g, int fd, int revents) /* Called by main loop when our timeout expires */ static void timer_cb(struct GlobalInfo *g, int revents) { - CURLMcode rc; + CURLMcode mresult; uint64_t count = 0; ssize_t err = 0; @@ -242,9 +242,9 @@ static void timer_cb(struct GlobalInfo *g, int revents) perror("read(tfd)"); } - rc = curl_multi_socket_action(g->multi, + mresult = curl_multi_socket_action(g->multi, CURL_SOCKET_TIMEOUT, 0, &g->still_running); - mcode_or_die("timer_cb: curl_multi_socket_action", rc); + mcode_or_die("timer_cb: curl_multi_socket_action", mresult); check_multi_info(g); } @@ -347,7 +347,7 @@ static int prog_cb(void *p, double dltotal, double dlnow, double ult, static void new_conn(const char *url, struct GlobalInfo *g) { struct ConnInfo *conn; - CURLMcode rc; + CURLMcode mresult; conn = (struct ConnInfo *)calloc(1, sizeof(*conn)); conn->error[0] = '\0'; @@ -373,8 +373,8 @@ static void new_conn(const char *url, struct GlobalInfo *g) curl_easy_setopt(conn->curl, CURLOPT_LOW_SPEED_LIMIT, 10L); fprintf(MSG_OUT, "Adding easy %p to multi %p (%s)\n", conn->curl, g->multi, url); - rc = curl_multi_add_handle(g->multi, conn->curl); - mcode_or_die("new_conn: curl_multi_add_handle", rc); + mresult = curl_multi_add_handle(g->multi, conn->curl); + mcode_or_die("new_conn: curl_multi_add_handle", mresult); /* note that the add_handle() sets a timeout to trigger soon so that the * necessary socket_action() call gets called by this app */ diff --git a/docs/examples/evhiperfifo.c b/docs/examples/evhiperfifo.c index 46cfc0a859..eb79a29090 100644 --- a/docs/examples/evhiperfifo.c +++ b/docs/examples/evhiperfifo.c @@ -189,7 +189,7 @@ static void check_multi_info(struct GlobalInfo *g) static void event_cb(EV_P_ struct ev_io *w, int revents) { struct GlobalInfo *g; - CURLMcode rc; + CURLMcode mresult; int action; printf("%s w %p revents %i\n", __PRETTY_FUNCTION__, (void *)w, revents); @@ -197,8 +197,8 @@ static void event_cb(EV_P_ struct ev_io *w, int revents) action = ((revents & EV_READ) ? CURL_POLL_IN : 0) | ((revents & EV_WRITE) ? CURL_POLL_OUT : 0); - rc = curl_multi_socket_action(g->multi, w->fd, action, &g->still_running); - mcode_or_die("event_cb: curl_multi_socket_action", rc); + mresult = curl_multi_socket_action(g->multi, w->fd, action, &g->still_running); + mcode_or_die("event_cb: curl_multi_socket_action", mresult); check_multi_info(g); if(g->still_running <= 0) { fprintf(MSG_OUT, "last transfer done, kill timeout\n"); @@ -210,15 +210,15 @@ static void event_cb(EV_P_ struct ev_io *w, int revents) static void timer_cb(EV_P_ struct ev_timer *w, int revents) { struct GlobalInfo *g; - CURLMcode rc; + CURLMcode mresult; printf("%s w %p revents %i\n", __PRETTY_FUNCTION__, (void *)w, revents); g = (struct GlobalInfo *)w->data; - rc = curl_multi_socket_action(g->multi, CURL_SOCKET_TIMEOUT, 0, + mresult = curl_multi_socket_action(g->multi, CURL_SOCKET_TIMEOUT, 0, &g->still_running); - mcode_or_die("timer_cb: curl_multi_socket_action", rc); + mcode_or_die("timer_cb: curl_multi_socket_action", mresult); check_multi_info(g); } @@ -321,7 +321,7 @@ static int xferinfo_cb(void *p, curl_off_t dltotal, curl_off_t dlnow, static void new_conn(const char *url, struct GlobalInfo *g) { struct ConnInfo *conn; - CURLMcode rc; + CURLMcode mresult; conn = calloc(1, sizeof(*conn)); conn->error[0] = '\0'; @@ -347,8 +347,8 @@ static void new_conn(const char *url, struct GlobalInfo *g) fprintf(MSG_OUT, "Adding easy %p to multi %p (%s)\n", conn->curl, g->multi, url); - rc = curl_multi_add_handle(g->multi, conn->curl); - mcode_or_die("new_conn: curl_multi_add_handle", rc); + mresult = curl_multi_add_handle(g->multi, conn->curl); + mcode_or_die("new_conn: curl_multi_add_handle", mresult); /* note that add_handle() sets a timeout to trigger soon so that the necessary socket_action() gets called */ diff --git a/docs/examples/ghiper.c b/docs/examples/ghiper.c index b3e0803550..9a6645fa5f 100644 --- a/docs/examples/ghiper.c +++ b/docs/examples/ghiper.c @@ -156,11 +156,11 @@ static void check_multi_info(struct GlobalInfo *g) static gboolean timer_cb(gpointer data) { struct GlobalInfo *g = (struct GlobalInfo *)data; - CURLMcode rc; + CURLMcode mresult; - rc = curl_multi_socket_action(g->multi, + mresult = curl_multi_socket_action(g->multi, CURL_SOCKET_TIMEOUT, 0, &g->still_running); - mcode_or_die("timer_cb: curl_multi_socket_action", rc); + mcode_or_die("timer_cb: curl_multi_socket_action", mresult); check_multi_info(g); return FALSE; } @@ -191,15 +191,15 @@ static int update_timeout_cb(CURLM *multi, long timeout_ms, void *userp) static gboolean event_cb(GIOChannel *ch, GIOCondition condition, gpointer data) { struct GlobalInfo *g = (struct GlobalInfo *)data; - CURLMcode rc; + CURLMcode mresult; int fd = g_io_channel_unix_get_fd(ch); int action = ((condition & G_IO_IN) ? CURL_CSELECT_IN : 0) | ((condition & G_IO_OUT) ? CURL_CSELECT_OUT : 0); - rc = curl_multi_socket_action(g->multi, fd, action, &g->still_running); - mcode_or_die("event_cb: curl_multi_socket_action", rc); + mresult = curl_multi_socket_action(g->multi, fd, action, &g->still_running); + mcode_or_die("event_cb: curl_multi_socket_action", mresult); check_multi_info(g); if(g->still_running) { @@ -309,7 +309,7 @@ static int xferinfo_cb(void *p, curl_off_t dltotal, curl_off_t dlnow, static void new_conn(const char *url, struct GlobalInfo *g) { struct ConnInfo *conn; - CURLMcode rc; + CURLMcode mresult; conn = g_malloc0(sizeof(*conn)); conn->error[0] = '\0'; @@ -335,8 +335,8 @@ static void new_conn(const char *url, struct GlobalInfo *g) curl_easy_setopt(conn->curl, CURLOPT_LOW_SPEED_TIME, 30L); MSG_OUT("Adding easy %p to multi %p (%s)\n", conn->curl, g->multi, url); - rc = curl_multi_add_handle(g->multi, conn->curl); - mcode_or_die("new_conn: curl_multi_add_handle", rc); + mresult = curl_multi_add_handle(g->multi, conn->curl); + mcode_or_die("new_conn: curl_multi_add_handle", mresult); /* note that add_handle() sets a timeout to trigger soon so that the necessary socket_action() gets called */ diff --git a/docs/examples/hiperfifo.c b/docs/examples/hiperfifo.c index 79af5268c8..ffef02f408 100644 --- a/docs/examples/hiperfifo.c +++ b/docs/examples/hiperfifo.c @@ -196,14 +196,14 @@ static void check_multi_info(struct GlobalInfo *g) static void event_cb(int fd, short kind, void *userp) { struct GlobalInfo *g = (struct GlobalInfo *)userp; - CURLMcode rc; + CURLMcode mresult; int action = ((kind & EV_READ) ? CURL_CSELECT_IN : 0) | ((kind & EV_WRITE) ? CURL_CSELECT_OUT : 0); - rc = curl_multi_socket_action(g->multi, fd, action, &g->still_running); - mcode_or_die("event_cb: curl_multi_socket_action", rc); + mresult = curl_multi_socket_action(g->multi, fd, action, &g->still_running); + mcode_or_die("event_cb: curl_multi_socket_action", mresult); check_multi_info(g); if(g->still_running <= 0) { @@ -218,13 +218,13 @@ static void event_cb(int fd, short kind, void *userp) static void timer_cb(int fd, short kind, void *userp) { struct GlobalInfo *g = (struct GlobalInfo *)userp; - CURLMcode rc; + CURLMcode mresult; (void)fd; (void)kind; - rc = curl_multi_socket_action(g->multi, + mresult = curl_multi_socket_action(g->multi, CURL_SOCKET_TIMEOUT, 0, &g->still_running); - mcode_or_die("timer_cb: curl_multi_socket_action", rc); + mcode_or_die("timer_cb: curl_multi_socket_action", mresult); check_multi_info(g); } @@ -319,7 +319,7 @@ static int xferinfo_cb(void *p, curl_off_t dltotal, curl_off_t dlnow, static void new_conn(const char *url, struct GlobalInfo *g) { struct ConnInfo *conn; - CURLMcode rc; + CURLMcode mresult; conn = calloc(1, sizeof(*conn)); conn->error[0] = '\0'; @@ -343,8 +343,8 @@ static void new_conn(const char *url, struct GlobalInfo *g) curl_easy_setopt(conn->curl, CURLOPT_FOLLOWLOCATION, 1L); fprintf(MSG_OUT, "Adding easy %p to multi %p (%s)\n", conn->curl, g->multi, url); - rc = curl_multi_add_handle(g->multi, conn->curl); - mcode_or_die("new_conn: curl_multi_add_handle", rc); + mresult = curl_multi_add_handle(g->multi, conn->curl); + mcode_or_die("new_conn: curl_multi_add_handle", mresult); /* note that the add_handle() sets a time-out to trigger soon so that the necessary socket_action() gets called */ diff --git a/docs/examples/http2-download.c b/docs/examples/http2-download.c index 054f697b3e..635a8c7177 100644 --- a/docs/examples/http2-download.c +++ b/docs/examples/http2-download.c @@ -232,13 +232,13 @@ int main(int argc, char **argv) curl_multi_setopt(multi, CURLMOPT_PIPELINING, CURLPIPE_MULTIPLEX); do { - CURLMcode mc = curl_multi_perform(multi, &still_running); + CURLMcode mresult = curl_multi_perform(multi, &still_running); if(still_running) /* wait for activity, timeout or "nothing" */ - mc = curl_multi_poll(multi, NULL, 0, 1000, NULL); + mresult = curl_multi_poll(multi, NULL, 0, 1000, NULL); - if(mc) + if(mresult) break; } while(still_running); diff --git a/docs/examples/http2-pushinmemory.c b/docs/examples/http2-pushinmemory.c index df896e1af5..d9bc038a02 100644 --- a/docs/examples/http2-pushinmemory.c +++ b/docs/examples/http2-pushinmemory.c @@ -149,12 +149,12 @@ int main(void) int still_running; /* keep number of running handles */ int rc; - CURLMcode mcode = curl_multi_perform(multi, &still_running); - if(mcode) + CURLMcode mresult = curl_multi_perform(multi, &still_running); + if(mresult) break; - mcode = curl_multi_wait(multi, NULL, 0, 1000, &rc); - if(mcode) + mresult = curl_multi_wait(multi, NULL, 0, 1000, &rc); + if(mresult) break; /* diff --git a/docs/examples/http2-serverpush.c b/docs/examples/http2-serverpush.c index eb67bfe671..a0e82bd5e8 100644 --- a/docs/examples/http2-serverpush.c +++ b/docs/examples/http2-serverpush.c @@ -251,13 +251,13 @@ int main(int argc, char *argv[]) do { struct CURLMsg *m; int still_running; /* keep number of running handles */ - CURLMcode mc = curl_multi_perform(multi, &still_running); + CURLMcode mresult = curl_multi_perform(multi, &still_running); if(still_running) /* wait for activity, timeout or "nothing" */ - mc = curl_multi_poll(multi, NULL, 0, 1000, NULL); + mresult = curl_multi_poll(multi, NULL, 0, 1000, NULL); - if(mc) + if(mresult) break; /* diff --git a/docs/examples/http2-upload.c b/docs/examples/http2-upload.c index 162c4c0d36..318822b8f2 100644 --- a/docs/examples/http2-upload.c +++ b/docs/examples/http2-upload.c @@ -338,13 +338,13 @@ int main(int argc, char **argv) curl_multi_setopt(multi, CURLMOPT_MAX_HOST_CONNECTIONS, 1L); do { - CURLMcode mc = curl_multi_perform(multi, &still_running); + CURLMcode mresult = curl_multi_perform(multi, &still_running); if(still_running) /* wait for activity, timeout or "nothing" */ - mc = curl_multi_poll(multi, NULL, 0, 1000, NULL); + mresult = curl_multi_poll(multi, NULL, 0, 1000, NULL); - if(mc) + if(mresult) break; } while(still_running); diff --git a/docs/examples/imap-multi.c b/docs/examples/imap-multi.c index afbcfbb515..3d56cb1e3d 100644 --- a/docs/examples/imap-multi.c +++ b/docs/examples/imap-multi.c @@ -63,13 +63,13 @@ int main(void) curl_multi_add_handle(multi, curl); do { - CURLMcode mc = curl_multi_perform(multi, &still_running); + CURLMcode mresult = curl_multi_perform(multi, &still_running); if(still_running) /* wait for activity, timeout or "nothing" */ - mc = curl_multi_poll(multi, NULL, 0, 1000, NULL); + mresult = curl_multi_poll(multi, NULL, 0, 1000, NULL); - if(mc) + if(mresult) break; } while(still_running); diff --git a/docs/examples/multi-app.c b/docs/examples/multi-app.c index 51492e8ade..faa91c0b66 100644 --- a/docs/examples/multi-app.c +++ b/docs/examples/multi-app.c @@ -74,13 +74,13 @@ int main(void) curl_multi_add_handle(multi, curl[i]); while(still_running) { - CURLMcode mc = curl_multi_perform(multi, &still_running); + CURLMcode mresult = curl_multi_perform(multi, &still_running); if(still_running) /* wait for activity, timeout or "nothing" */ - mc = curl_multi_poll(multi, NULL, 0, 1000, NULL); + mresult = curl_multi_poll(multi, NULL, 0, 1000, NULL); - if(mc) + if(mresult) break; } diff --git a/docs/examples/multi-debugcallback.c b/docs/examples/multi-debugcallback.c index 561a967abf..2f5e6ffdce 100644 --- a/docs/examples/multi-debugcallback.c +++ b/docs/examples/multi-debugcallback.c @@ -146,13 +146,13 @@ int main(void) curl_multi_add_handle(multi, curl); do { - CURLMcode mc = curl_multi_perform(multi, &still_running); + CURLMcode mresult = curl_multi_perform(multi, &still_running); if(still_running) /* wait for activity, timeout or "nothing" */ - mc = curl_multi_poll(multi, NULL, 0, 1000, NULL); + mresult = curl_multi_poll(multi, NULL, 0, 1000, NULL); - if(mc) + if(mresult) break; } while(still_running); diff --git a/docs/examples/multi-double.c b/docs/examples/multi-double.c index 8a0c3d27fe..4e10344772 100644 --- a/docs/examples/multi-double.c +++ b/docs/examples/multi-double.c @@ -69,13 +69,13 @@ int main(void) CURLMsg *msg; int queued; - CURLMcode mc = curl_multi_perform(multi, &still_running); + CURLMcode mresult = curl_multi_perform(multi, &still_running); if(still_running) /* wait for activity, timeout or "nothing" */ - mc = curl_multi_poll(multi, NULL, 0, 1000, NULL); + mresult = curl_multi_poll(multi, NULL, 0, 1000, NULL); - if(mc) + if(mresult) break; do { diff --git a/docs/examples/multi-formadd.c b/docs/examples/multi-formadd.c index 7374fae092..3e80393147 100644 --- a/docs/examples/multi-formadd.c +++ b/docs/examples/multi-formadd.c @@ -97,13 +97,13 @@ int main(void) curl_multi_add_handle(multi, curl); do { - CURLMcode mc = curl_multi_perform(multi, &still_running); + CURLMcode mresult = curl_multi_perform(multi, &still_running); if(still_running) /* wait for activity, timeout or "nothing" */ - mc = curl_multi_poll(multi, NULL, 0, 1000, NULL); + mresult = curl_multi_poll(multi, NULL, 0, 1000, NULL); - if(mc) + if(mresult) break; } while(still_running); diff --git a/docs/examples/multi-legacy.c b/docs/examples/multi-legacy.c index 42670129f9..d270cf2972 100644 --- a/docs/examples/multi-legacy.c +++ b/docs/examples/multi-legacy.c @@ -86,7 +86,7 @@ int main(void) struct timeval timeout; int rc; /* select() return code */ - CURLMcode mc; /* curl_multi_fdset() return code */ + CURLMcode mresult; /* curl_multi_fdset() return code */ fd_set fdread; fd_set fdwrite; @@ -121,10 +121,10 @@ int main(void) } /* get file descriptors from the transfers */ - mc = curl_multi_fdset(multi, &fdread, &fdwrite, &fdexcep, &maxfd); + mresult = curl_multi_fdset(multi, &fdread, &fdwrite, &fdexcep, &maxfd); - if(mc != CURLM_OK) { - fprintf(stderr, "curl_multi_fdset() failed, code %d.\n", mc); + if(mresult != CURLM_OK) { + fprintf(stderr, "curl_multi_fdset() failed, code %d.\n", mresult); break; } diff --git a/docs/examples/multi-post.c b/docs/examples/multi-post.c index 678fb78d0b..68bcc37e96 100644 --- a/docs/examples/multi-post.c +++ b/docs/examples/multi-post.c @@ -84,13 +84,13 @@ int main(void) curl_multi_add_handle(multi, curl); do { - CURLMcode mc = curl_multi_perform(multi, &still_running); + CURLMcode mresult = curl_multi_perform(multi, &still_running); if(still_running) /* wait for activity, timeout or "nothing" */ - mc = curl_multi_poll(multi, NULL, 0, 1000, NULL); + mresult = curl_multi_poll(multi, NULL, 0, 1000, NULL); - if(mc) + if(mresult) break; } while(still_running); diff --git a/docs/examples/multi-single.c b/docs/examples/multi-single.c index 6c3f341164..d8a430b31c 100644 --- a/docs/examples/multi-single.c +++ b/docs/examples/multi-single.c @@ -59,14 +59,14 @@ int main(void) curl_multi_add_handle(multi, curl); do { - CURLMcode mc = curl_multi_perform(multi, &still_running); + CURLMcode mresult = curl_multi_perform(multi, &still_running); - if(!mc) + if(!mresult) /* wait for activity, timeout or "nothing" */ - mc = curl_multi_poll(multi, NULL, 0, 1000, NULL); + mresult = curl_multi_poll(multi, NULL, 0, 1000, NULL); - if(mc) { - fprintf(stderr, "curl_multi_poll() failed, code %d.\n", (int)mc); + if(mresult) { + fprintf(stderr, "curl_multi_poll() failed, code %d.\n", (int)mresult); break; } diff --git a/docs/examples/pop3-multi.c b/docs/examples/pop3-multi.c index be028a777a..022ab928c8 100644 --- a/docs/examples/pop3-multi.c +++ b/docs/examples/pop3-multi.c @@ -63,13 +63,13 @@ int main(void) curl_multi_add_handle(multi, curl); do { - CURLMcode mc = curl_multi_perform(multi, &still_running); + CURLMcode mresult = curl_multi_perform(multi, &still_running); if(still_running) /* wait for activity, timeout or "nothing" */ - mc = curl_multi_poll(multi, NULL, 0, 1000, NULL); + mresult = curl_multi_poll(multi, NULL, 0, 1000, NULL); - if(mc) + if(mresult) break; } while(still_running); diff --git a/docs/examples/smtp-multi.c b/docs/examples/smtp-multi.c index acc54bacdf..d623f1edcd 100644 --- a/docs/examples/smtp-multi.c +++ b/docs/examples/smtp-multi.c @@ -126,13 +126,13 @@ int main(void) curl_multi_add_handle(multi, curl); do { - CURLMcode mc = curl_multi_perform(multi, &still_running); + CURLMcode mresult = curl_multi_perform(multi, &still_running); if(still_running) /* wait for activity, timeout or "nothing" */ - mc = curl_multi_poll(multi, NULL, 0, 1000, NULL); + mresult = curl_multi_poll(multi, NULL, 0, 1000, NULL); - if(mc) + if(mresult) break; } while(still_running); diff --git a/docs/libcurl/curl_multi_assign.md b/docs/libcurl/curl_multi_assign.md index 36579fd9f8..6ae60fe667 100644 --- a/docs/libcurl/curl_multi_assign.md +++ b/docs/libcurl/curl_multi_assign.md @@ -60,9 +60,9 @@ int main(void) curl_socket_t fd = 0; /* file descriptor to associate our data with */ /* make our struct pointer associated with socket fd */ - CURLMcode mc = curl_multi_assign(multi, fd, &private); - if(mc) - printf("error: %s\n", curl_multi_strerror(mc)); + CURLMcode mresult = curl_multi_assign(multi, fd, &private); + if(mresult) + printf("error: %s\n", curl_multi_strerror(mresult)); } ~~~ diff --git a/docs/libcurl/curl_multi_fdset.md b/docs/libcurl/curl_multi_fdset.md index 24d6664f49..7ab65e424a 100644 --- a/docs/libcurl/curl_multi_fdset.md +++ b/docs/libcurl/curl_multi_fdset.md @@ -91,7 +91,7 @@ int main(void) fd_set fdexcep; int maxfd; int rc; - CURLMcode mc; + CURLMcode mresult; struct timeval timeout = { 1, 0 }; CURLM *multi = curl_multi_init(); @@ -105,17 +105,17 @@ int main(void) FD_ZERO(&fdexcep); /* get file descriptors from the transfers */ - mc = curl_multi_fdset(multi, &fdread, &fdwrite, &fdexcep, &maxfd); + mresult = curl_multi_fdset(multi, &fdread, &fdwrite, &fdexcep, &maxfd); - if(mc != CURLM_OK) { - fprintf(stderr, "curl_multi_fdset() failed, code %d.\n", mc); + if(mresult != CURLM_OK) { + fprintf(stderr, "curl_multi_fdset() failed, code %d.\n", mresult); break; } /* wait for activity on one of the sockets */ rc = select(maxfd + 1, &fdread, &fdwrite, &fdexcep, &timeout); - } while(!mc); + } while(!mresult); } ~~~ diff --git a/docs/libcurl/curl_multi_perform.md b/docs/libcurl/curl_multi_perform.md index 6e5f0cd8cf..3856e9fd19 100644 --- a/docs/libcurl/curl_multi_perform.md +++ b/docs/libcurl/curl_multi_perform.md @@ -74,14 +74,14 @@ int main(void) if(curl) { curl_multi_add_handle(multi, curl); do { - CURLMcode mc = curl_multi_perform(multi, &still_running); + CURLMcode mresult = curl_multi_perform(multi, &still_running); - if(!mc && still_running) + if(!mresult && still_running) /* wait for activity, timeout or "nothing" */ - mc = curl_multi_poll(multi, NULL, 0, 1000, NULL); + mresult = curl_multi_poll(multi, NULL, 0, 1000, NULL); - if(mc) { - fprintf(stderr, "curl_multi_poll() failed, code %d.\n", (int)mc); + if(mresult) { + fprintf(stderr, "curl_multi_poll() failed, code %d.\n", (int)mresult); break; } diff --git a/docs/libcurl/curl_multi_poll.md b/docs/libcurl/curl_multi_poll.md index 64aeac9d10..8c2488feb3 100644 --- a/docs/libcurl/curl_multi_poll.md +++ b/docs/libcurl/curl_multi_poll.md @@ -108,12 +108,12 @@ int main(void) curl_multi_add_handle(multi_handle, easy_handle); do { - CURLMcode mc; + CURLMcode mresult; int numfds; - mc = curl_multi_perform(multi_handle, &still_running); + mresult = curl_multi_perform(multi_handle, &still_running); - if(mc == CURLM_OK) { + if(mresult == CURLM_OK) { struct curl_waitfd myown; myown.fd = myfd; myown.events = CURL_WAIT_POLLIN; /* wait for input */ @@ -121,7 +121,7 @@ int main(void) /* wait for activity on curl's descriptors or on our own, or timeout */ - mc = curl_multi_poll(multi_handle, &myown, 1, 1000, &numfds); + mresult = curl_multi_poll(multi_handle, &myown, 1, 1000, &numfds); if(myown.revents) { /* did our descriptor receive an event? */ @@ -129,8 +129,8 @@ int main(void) } } - if(mc != CURLM_OK) { - fprintf(stderr, "curl_multi failed, code %d.\n", mc); + if(mresult != CURLM_OK) { + fprintf(stderr, "curl_multi failed, code %d.\n", mresult); break; } diff --git a/docs/libcurl/curl_multi_socket_action.md b/docs/libcurl/curl_multi_socket_action.md index 5d4271a386..44a06406c3 100644 --- a/docs/libcurl/curl_multi_socket_action.md +++ b/docs/libcurl/curl_multi_socket_action.md @@ -111,9 +111,9 @@ int main(void) CURLM *multi = curl_multi_init(); - CURLMcode mc = curl_multi_socket_action(multi, fd, bitmask, &running); - if(mc) - printf("error: %s\n", curl_multi_strerror(mc)); + CURLMcode mresult = curl_multi_socket_action(multi, fd, bitmask, &running); + if(mresult) + printf("error: %s\n", curl_multi_strerror(mresult)); } ~~~ diff --git a/docs/libcurl/curl_multi_strerror.md b/docs/libcurl/curl_multi_strerror.md index d419ab2e82..39b5b2d524 100644 --- a/docs/libcurl/curl_multi_strerror.md +++ b/docs/libcurl/curl_multi_strerror.md @@ -41,9 +41,9 @@ int main(void) int still_running; CURLM *multi = curl_multi_init(); - CURLMcode mc = curl_multi_perform(multi, &still_running); - if(mc) - printf("error: %s\n", curl_multi_strerror(mc)); + CURLMcode mresult = curl_multi_perform(multi, &still_running); + if(mresult) + printf("error: %s\n", curl_multi_strerror(mresult)); } ~~~ diff --git a/docs/libcurl/curl_multi_wait.md b/docs/libcurl/curl_multi_wait.md index b8f5a18e67..f9a7b7b644 100644 --- a/docs/libcurl/curl_multi_wait.md +++ b/docs/libcurl/curl_multi_wait.md @@ -97,18 +97,18 @@ int main(void) curl_multi_add_handle(multi, easy); do { - CURLMcode mc; + CURLMcode mresult; int numfds; - mc = curl_multi_perform(multi, &still_running); + mresult = curl_multi_perform(multi, &still_running); - if(mc == CURLM_OK) { + if(mresult == CURLM_OK) { /* wait for activity, timeout or "nothing" */ - mc = curl_multi_wait(multi, NULL, 0, 1000, &numfds); + mresult = curl_multi_wait(multi, NULL, 0, 1000, &numfds); } - if(mc != CURLM_OK) { - fprintf(stderr, "curl_multi failed, code %d.\n", mc); + if(mresult != CURLM_OK) { + fprintf(stderr, "curl_multi failed, code %d.\n", mresult); break; } diff --git a/docs/libcurl/curl_multi_waitfds.md b/docs/libcurl/curl_multi_waitfds.md index 7d828a4d7c..4d6611aa26 100644 --- a/docs/libcurl/curl_multi_waitfds.md +++ b/docs/libcurl/curl_multi_waitfds.md @@ -62,7 +62,7 @@ than or equal to the number of descriptors. int main(void) { - CURLMcode mc; + CURLMcode mresult; struct curl_waitfd *ufds; CURLM *multi = curl_multi_init(); @@ -73,10 +73,10 @@ int main(void) /* get the count of file descriptors from the transfers */ unsigned int fd_count = 0; - mc = curl_multi_waitfds(multi, NULL, 0, &fd_count); + mresult = curl_multi_waitfds(multi, NULL, 0, &fd_count); - if(mc != CURLM_OK) { - fprintf(stderr, "curl_multi_waitfds() failed, code %d.\n", mc); + if(mresult != CURLM_OK) { + fprintf(stderr, "curl_multi_waitfds() failed, code %d.\n", mresult); break; } @@ -87,10 +87,10 @@ int main(void) ufds = malloc(fd_count * sizeof(struct curl_waitfd)); /* get wait descriptors from the transfers and put them into array. */ - mc = curl_multi_waitfds(multi, ufds, fd_count, &fd_count); + mresult = curl_multi_waitfds(multi, ufds, fd_count, &fd_count); - if(mc != CURLM_OK) { - fprintf(stderr, "curl_multi_waitfds() failed, code %d.\n", mc); + if(mresult != CURLM_OK) { + fprintf(stderr, "curl_multi_waitfds() failed, code %d.\n", mresult); free(ufds); break; } @@ -98,7 +98,7 @@ int main(void) /* Do polling on descriptors in ufds */ free(ufds); - } while(!mc); + } while(!mresult); } ~~~ diff --git a/docs/libcurl/curl_multi_wakeup.md b/docs/libcurl/curl_multi_wakeup.md index 78597bf88f..d95f9eb6b8 100644 --- a/docs/libcurl/curl_multi_wakeup.md +++ b/docs/libcurl/curl_multi_wakeup.md @@ -61,14 +61,14 @@ int main(void) /* this is thread 1 */ do { - CURLMcode mc; + CURLMcode mresult; int numfds; - mc = curl_multi_perform(multi, &still_running); + mresult = curl_multi_perform(multi, &still_running); - if(mc == CURLM_OK) { + if(mresult == CURLM_OK) { /* wait for activity, timeout or wakeup */ - mc = curl_multi_poll(multi, NULL, 0, 10000, &numfds); + mresult = curl_multi_poll(multi, NULL, 0, 10000, &numfds); } if(time_to_die())