From cd7904f5a970ef14e84993a3bb9d72638c760cf8 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 9 May 2025 15:41:48 +0200 Subject: [PATCH] CURLMOPT_TIMERFUNCTION.md: correct the example Fixes #17301 Reported-by: Dirk Feytons Closes #17303 --- docs/libcurl/opts/CURLMOPT_TIMERDATA.md | 2 +- docs/libcurl/opts/CURLMOPT_TIMERFUNCTION.md | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/libcurl/opts/CURLMOPT_TIMERDATA.md b/docs/libcurl/opts/CURLMOPT_TIMERDATA.md index 69cd4e215d..7226bcb481 100644 --- a/docs/libcurl/opts/CURLMOPT_TIMERDATA.md +++ b/docs/libcurl/opts/CURLMOPT_TIMERDATA.md @@ -50,7 +50,7 @@ static int timerfunc(CURLM *multi, long timeout_ms, void *clientp) struct priv *mydata = clientp; printf("our ptr: %p\n", mydata->custom); - if(timeout_ms) { + if(timeout_ms >= 0) { /* this is the new single timeout to wait for */ } else { diff --git a/docs/libcurl/opts/CURLMOPT_TIMERFUNCTION.md b/docs/libcurl/opts/CURLMOPT_TIMERFUNCTION.md index a4ecf622d7..ac55fb351b 100644 --- a/docs/libcurl/opts/CURLMOPT_TIMERFUNCTION.md +++ b/docs/libcurl/opts/CURLMOPT_TIMERFUNCTION.md @@ -46,7 +46,8 @@ time *replaces* the former timeout. The application should then effectively cancel the old timeout and set a new timeout using this new expire time. A **timeout_ms** value of -1 passed to this callback means you should delete -the timer. All other values are valid expire times in number of milliseconds. +the timer. All other values are valid expire times in number of milliseconds - +including zero milliseconds. The **timer_callback** is called when the timeout expire time is changed. @@ -82,8 +83,8 @@ static int timerfunc(CURLM *multi, long timeout_ms, void *clientp) struct priv *mydata = clientp; printf("our ptr: %p\n", mydata->custom); - if(timeout_ms) { - /* this is the new single timeout to wait for */ + if(timeout_ms >= 0) { + /* this is the new single timeout to wait for, including zero */ } else { /* delete the timeout, nothing to wait for now */ -- 2.47.3