@@ -132,8 +132,8 @@ CURL_EXTERN CURLM *curl_multi_init(void);
132132 *
133133 * Returns: CURLMcode type, general multi error code.
134134 */
135- CURL_EXTERN CURLMcode curl_multi_add_handle (CURLM * multi_handle ,
136- CURL * curl_handle );
135+ CURL_EXTERN CURLMcode curl_multi_add_handle (CURLM * m ,
136+ CURL * curl );
137137
138138/*
139139 * Name: curl_multi_remove_handle()
@@ -142,8 +142,8 @@ CURL_EXTERN CURLMcode curl_multi_add_handle(CURLM *multi_handle,
142142 *
143143 * Returns: CURLMcode type, general multi error code.
144144 */
145- CURL_EXTERN CURLMcode curl_multi_remove_handle (CURLM * multi_handle ,
146- CURL * curl_handle );
145+ CURL_EXTERN CURLMcode curl_multi_remove_handle (CURLM * m ,
146+ CURL * curl );
147147
148148/*
149149 * Name: curl_multi_fdset()
@@ -154,7 +154,7 @@ CURL_EXTERN CURLMcode curl_multi_remove_handle(CURLM *multi_handle,
154154 *
155155 * Returns: CURLMcode type, general multi error code.
156156 */
157- CURL_EXTERN CURLMcode curl_multi_fdset (CURLM * multi_handle ,
157+ CURL_EXTERN CURLMcode curl_multi_fdset (CURLM * m ,
158158 fd_set * read_fd_set ,
159159 fd_set * write_fd_set ,
160160 fd_set * exc_fd_set ,
@@ -168,7 +168,7 @@ CURL_EXTERN CURLMcode curl_multi_fdset(CURLM *multi_handle,
168168 *
169169 * Returns: CURLMcode type, general multi error code.
170170 */
171- CURL_EXTERN CURLMcode curl_multi_wait (CURLM * multi_handle ,
171+ CURL_EXTERN CURLMcode curl_multi_wait (CURLM * m ,
172172 struct curl_waitfd extra_fds [],
173173 unsigned int extra_nfds ,
174174 int timeout_ms ,
@@ -182,7 +182,7 @@ CURL_EXTERN CURLMcode curl_multi_wait(CURLM *multi_handle,
182182 *
183183 * Returns: CURLMcode type, general multi error code.
184184 */
185- CURL_EXTERN CURLMcode curl_multi_poll (CURLM * multi_handle ,
185+ CURL_EXTERN CURLMcode curl_multi_poll (CURLM * m ,
186186 struct curl_waitfd extra_fds [],
187187 unsigned int extra_nfds ,
188188 int timeout_ms ,
@@ -195,7 +195,7 @@ CURL_EXTERN CURLMcode curl_multi_poll(CURLM *multi_handle,
195195 *
196196 * Returns: CURLMcode type, general multi error code.
197197 */
198- CURL_EXTERN CURLMcode curl_multi_wakeup (CURLM * multi_handle );
198+ CURL_EXTERN CURLMcode curl_multi_wakeup (CURLM * m );
199199
200200/*
201201 * Name: curl_multi_perform()
@@ -213,7 +213,7 @@ CURL_EXTERN CURLMcode curl_multi_wakeup(CURLM *multi_handle);
213213 * still have occurred problems on individual transfers even when
214214 * this returns OK.
215215 */
216- CURL_EXTERN CURLMcode curl_multi_perform (CURLM * multi_handle ,
216+ CURL_EXTERN CURLMcode curl_multi_perform (CURLM * m ,
217217 int * running_handles );
218218
219219/*
@@ -226,7 +226,7 @@ CURL_EXTERN CURLMcode curl_multi_perform(CURLM *multi_handle,
226226 *
227227 * Returns: CURLMcode type, general multi error code.
228228 */
229- CURL_EXTERN CURLMcode curl_multi_cleanup (CURLM * multi_handle );
229+ CURL_EXTERN CURLMcode curl_multi_cleanup (CURLM * m );
230230
231231/*
232232 * Name: curl_multi_info_read()
@@ -256,7 +256,7 @@ CURL_EXTERN CURLMcode curl_multi_cleanup(CURLM *multi_handle);
256256 * queue (after this read) in the integer the second argument points
257257 * to.
258258 */
259- CURL_EXTERN CURLMsg * curl_multi_info_read (CURLM * multi_handle ,
259+ CURL_EXTERN CURLMsg * curl_multi_info_read (CURLM * m ,
260260 int * msgs_in_queue );
261261
262262/*
@@ -308,21 +308,21 @@ typedef int (*curl_socket_callback)(CURL *easy, /* easy handle */
308308 *
309309 * Returns: The callback should return zero.
310310 */
311- typedef int (* curl_multi_timer_callback )(CURLM * multi , /* multi handle */
311+ typedef int (* curl_multi_timer_callback )(CURLM * m , /* multi handle */
312312 long timeout_ms , /* see above */
313313 void * userp ); /* private callback
314314 pointer */
315315
316316CURL_EXTERN CURLMcode CURL_DEPRECATED (7.19 .5 , "Use curl_multi_socket_action()" )
317- curl_multi_socket (CURLM * multi_handle , curl_socket_t s , int * running_handles );
317+ curl_multi_socket (CURLM * m , curl_socket_t s , int * running_handles );
318318
319- CURL_EXTERN CURLMcode curl_multi_socket_action (CURLM * multi_handle ,
319+ CURL_EXTERN CURLMcode curl_multi_socket_action (CURLM * m ,
320320 curl_socket_t s ,
321321 int ev_bitmask ,
322322 int * running_handles );
323323
324324CURL_EXTERN CURLMcode CURL_DEPRECATED (7.19 .5 , "Use curl_multi_socket_action()" )
325- curl_multi_socket_all (CURLM * multi_handle , int * running_handles );
325+ curl_multi_socket_all (CURLM * m , int * running_handles );
326326
327327#ifndef CURL_ALLOW_OLD_MULTI_SOCKET
328328/* This macro below was added in 7.16.3 to push users who recompile to use
@@ -340,8 +340,8 @@ curl_multi_socket_all(CURLM *multi_handle, int *running_handles);
340340 *
341341 * Returns: CURLM error code.
342342 */
343- CURL_EXTERN CURLMcode curl_multi_timeout (CURLM * multi_handle ,
344- long * milliseconds );
343+ CURL_EXTERN CURLMcode curl_multi_timeout (CURLM * m ,
344+ long * timeout_ms );
345345
346346typedef enum {
347347 /* This is the socket callback function pointer */
@@ -435,7 +435,7 @@ typedef enum {
435435 *
436436 * Returns: CURLM error code.
437437 */
438- CURL_EXTERN CURLMcode curl_multi_setopt (CURLM * multi_handle ,
438+ CURL_EXTERN CURLMcode curl_multi_setopt (CURLM * m ,
439439 CURLMoption option , ...);
440440
441441/*
@@ -447,7 +447,7 @@ CURL_EXTERN CURLMcode curl_multi_setopt(CURLM *multi_handle,
447447 *
448448 * Returns: CURLM error code.
449449 */
450- CURL_EXTERN CURLMcode curl_multi_assign (CURLM * multi_handle ,
450+ CURL_EXTERN CURLMcode curl_multi_assign (CURLM * m ,
451451 curl_socket_t sockfd , void * sockp );
452452
453453/*
@@ -460,7 +460,7 @@ CURL_EXTERN CURLMcode curl_multi_assign(CURLM *multi_handle,
460460 *
461461 * Returns: NULL on failure, otherwise a CURL **array pointer
462462 */
463- CURL_EXTERN CURL * * curl_multi_get_handles (CURLM * multi_handle );
463+ CURL_EXTERN CURL * * curl_multi_get_handles (CURLM * m );
464464
465465typedef enum {
466466 CURLMINFO_NONE , /* first, never use this */
@@ -489,7 +489,7 @@ typedef enum {
489489 *
490490 * Returns: CULRM_OK or error when value could not be obtained.
491491 */
492- CURL_EXTERN CURLMcode curl_multi_get_offt (CURLM * multi_handle ,
492+ CURL_EXTERN CURLMcode curl_multi_get_offt (CURLM * m ,
493493 CURLMinfo_offt info ,
494494 curl_off_t * pvalue );
495495
@@ -528,7 +528,7 @@ typedef int (*curl_push_callback)(CURL *parent,
528528 *
529529 * Returns: CURLMcode type, general multi error code.
530530 */
531- CURL_EXTERN CURLMcode curl_multi_waitfds (CURLM * multi ,
531+ CURL_EXTERN CURLMcode curl_multi_waitfds (CURLM * m ,
532532 struct curl_waitfd * ufds ,
533533 unsigned int size ,
534534 unsigned int * fd_count );
@@ -542,15 +542,15 @@ CURL_EXTERN CURLMcode curl_multi_waitfds(CURLM *multi,
542542/*
543543 * Callback to install via CURLMOPT_NOTIFYFUNCTION.
544544 */
545- typedef void (* curl_notify_callback )(CURLM * multi ,
545+ typedef void (* curl_notify_callback )(CURLM * m ,
546546 unsigned int notification ,
547547 CURL * easy ,
548548 void * user_data );
549549
550- CURL_EXTERN CURLMcode curl_multi_notify_disable (CURLM * multi ,
550+ CURL_EXTERN CURLMcode curl_multi_notify_disable (CURLM * m ,
551551 unsigned int notification );
552552
553- CURL_EXTERN CURLMcode curl_multi_notify_enable (CURLM * multi ,
553+ CURL_EXTERN CURLMcode curl_multi_notify_enable (CURLM * m ,
554554 unsigned int notification );
555555
556556#ifdef __cplusplus
0 commit comments