point to the current functions, not the deprecated ones

This commit is contained in:
Daniel Stenberg 2009-09-11 20:19:21 +00:00
parent 4002fbe1f5
commit f60cb60fc6
1 changed files with 15 additions and 15 deletions

View File

@ -20,14 +20,14 @@ You can only set one option in each function call.
.SH OPTIONS .SH OPTIONS
.IP CURLMOPT_SOCKETFUNCTION .IP CURLMOPT_SOCKETFUNCTION
Pass a pointer to a function matching the \fBcurl_socket_callback\fP Pass a pointer to a function matching the \fBcurl_socket_callback\fP
prototype. The \fIcurl_multi_socket(3)\fP functions inform the application prototype. The \fIcurl_multi_socket_action(3)\fP function informs the
about updates in the socket (file descriptor) status by doing none, one, or application about updates in the socket (file descriptor) status by doing
multiple calls to the curl_socket_callback given in the \fBparam\fP none, one, or multiple calls to the curl_socket_callback given in the
argument. They update the status with changes since the previous time a \fBparam\fP argument. They update the status with changes since the previous
\fIcurl_multi_socket(3)\fP function was called. If the given callback pointer time a \fIcurl_multi_socket(3)\fP function was called. If the given callback
is NULL, no callback will be called. Set the callback's \fBuserp\fP argument pointer is NULL, no callback will be called. Set the callback's \fBuserp\fP
with \fICURLMOPT_SOCKETDATA\fP. See \fIcurl_multi_socket(3)\fP for more argument with \fICURLMOPT_SOCKETDATA\fP. See \fIcurl_multi_socket(3)\fP for
callback details. more callback details.
.IP CURLMOPT_SOCKETDATA .IP CURLMOPT_SOCKETDATA
Pass a pointer to whatever you want passed to the \fBcurl_socket_callback\fP's Pass a pointer to whatever you want passed to the \fBcurl_socket_callback\fP's
forth argument, the userp pointer. This is not used by libcurl but only forth argument, the userp pointer. This is not used by libcurl but only
@ -45,13 +45,13 @@ Pass a pointer to a function matching the \fBcurl_multi_timer_callback\fP
prototype. This function will then be called when the timeout value prototype. This function will then be called when the timeout value
changes. The timeout value is at what latest time the application should call changes. The timeout value is at what latest time the application should call
one of the \&"performing" functions of the multi interface one of the \&"performing" functions of the multi interface
(\fIcurl_multi_socket(3)\fP, \fIcurl_multi_socket_all(3)\fP and (\fIcurl_multi_socket_action(3)\fP and \fIcurl_multi_perform(3)\fP) - to allow
\fIcurl_multi_perform(3)\fP) - to allow libcurl to keep timeouts and retries libcurl to keep timeouts and retries etc to work. A timeout value of -1 means
etc to work. A timeout value of -1 means that there is no timeout at all, and that there is no timeout at all, and 0 means that the timeout is already
0 means that the timeout is already reached. Libcurl attempts to limit calling reached. Libcurl attempts to limit calling this only when the fixed future
this only when the fixed future timeout time actually changes. See also timeout time actually changes. See also \fICURLMOPT_TIMERDATA\fP. This
\fICURLMOPT_TIMERDATA\fP. This callback can be used instead of, or in addition callback can be used instead of, or in addition to,
to, \fIcurl_multi_timeout(3)\fP. (Added in 7.16.0) \fIcurl_multi_timeout(3)\fP. (Added in 7.16.0)
.IP CURLMOPT_TIMERDATA .IP CURLMOPT_TIMERDATA
Pass a pointer to whatever you want passed to the Pass a pointer to whatever you want passed to the
\fBcurl_multi_timer_callback\fP's third argument, the userp pointer. This is \fBcurl_multi_timer_callback\fP's third argument, the userp pointer. This is