From: Daniel Stenberg Date: Mon, 17 Jan 2022 07:38:15 +0000 (+0100) Subject: CURLMOPT_TIMERFUNCTION/DATA.3: fix the examples X-Git-Tag: curl-7_82_0~201 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c24764ef596505faced006557068c00d48c598e8;p=thirdparty%2Fcurl.git CURLMOPT_TIMERFUNCTION/DATA.3: fix the examples ... to not call libcurl recursively back. Closes #8286 --- diff --git a/docs/libcurl/opts/CURLMOPT_TIMERDATA.3 b/docs/libcurl/opts/CURLMOPT_TIMERDATA.3 index 40c56fbd2a..681b1580b3 100644 --- a/docs/libcurl/opts/CURLMOPT_TIMERDATA.3 +++ b/docs/libcurl/opts/CURLMOPT_TIMERDATA.3 @@ -5,7 +5,7 @@ .\" * | (__| |_| | _ <| |___ .\" * \___|\___/|_| \_\_____| .\" * -.\" * Copyright (C) 1998 - 2017, Daniel Stenberg, , et al. +.\" * Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. .\" * .\" * This software is licensed as described in the file COPYING, which .\" * you should have received as part of this distribution. The terms @@ -68,7 +68,7 @@ static int timerfunc(CURLM *multi, long timeout_ms, void *userp) id = g_new(guint, 1); *id = g_timeout_add(timeout_ms, timeout_cb, id); } - curl_multi_setopt(multi, CURLMOPT_TIMERDATA, id); + current_timer = id; return 0; } diff --git a/docs/libcurl/opts/CURLMOPT_TIMERFUNCTION.3 b/docs/libcurl/opts/CURLMOPT_TIMERFUNCTION.3 index 5b394296e3..a7dfe0a39a 100644 --- a/docs/libcurl/opts/CURLMOPT_TIMERFUNCTION.3 +++ b/docs/libcurl/opts/CURLMOPT_TIMERFUNCTION.3 @@ -5,7 +5,7 @@ .\" * | (__| |_| | _ <| |___ .\" * \___|\___/|_| \_\_____| .\" * -.\" * Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. +.\" * Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. .\" * .\" * This software is licensed as described in the file COPYING, which .\" * you should have received as part of this distribution. The terms @@ -59,10 +59,10 @@ multi handle will be aborted and fail. This callback can be used instead of, or in addition to, \fIcurl_multi_timeout(3)\fP. -\fBWARNING:\fP even if it feels tempting, avoid calling libcurl directly from -within the callback itself when the \fBtimeout_ms\fP value is zero, since it -risks triggering an unpleasant recursive behavior that immediately calls -another call to the callback with a zero timeout... +\fBWARNING:\fP do not call libcurl directly from within the callback itself +when the \fBtimeout_ms\fP value is zero, since it risks triggering an +unpleasant recursive behavior that immediately calls another call to the +callback with a zero timeout... .SH DEFAULT NULL .SH PROTOCOLS @@ -97,7 +97,7 @@ static int timerfunc(CURLM *multi, long timeout_ms, void *userp) id = g_new(guint, 1); *id = g_timeout_add(timeout_ms, timeout_cb, id); } - curl_multi_setopt(multi, CURLMOPT_TIMERDATA, id); + current_timer = id; return 0; }