[newlib-cygwin/main] Cygwin: timer_delete: Fix return value

Corinna Vinschen corinna@sourceware.org
Wed Oct 23 11:28:59 GMT 2024


https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=6af8fea4bbad6678ad6ef82b00860877a01c3614

commit 6af8fea4bbad6678ad6ef82b00860877a01c3614
Author:     Christian Franke <christian.franke@t-online.de>
AuthorDate: Wed Oct 23 12:24:06 2024 +0200
Commit:     Corinna Vinschen <corinna@vinschen.de>
CommitDate: Wed Oct 23 13:25:09 2024 +0200

    Cygwin: timer_delete: Fix return value
    
    timer_delete() always returned failure.  This issue has been
    detected by 'stress-ng --hrtimers 1'.
    
    Fixes: 229ea3f23c015 ("Cygwin: posix timers: reimplement using OS timer")
    Signed-off-by: Christian Franke <christian.franke@t-online.de>

Diff:
---
 winsup/cygwin/posix_timer.cc | 1 +
 winsup/cygwin/release/3.5.5  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/winsup/cygwin/posix_timer.cc b/winsup/cygwin/posix_timer.cc
index 9d832f201463..a336b2bc2d59 100644
--- a/winsup/cygwin/posix_timer.cc
+++ b/winsup/cygwin/posix_timer.cc
@@ -530,6 +530,7 @@ timer_delete (timer_t timerid)
 	  __leave;
 	}
       delete in_tt;
+      ret = 0;
     }
   __except (EFAULT) {}
   __endtry
diff --git a/winsup/cygwin/release/3.5.5 b/winsup/cygwin/release/3.5.5
index d01f31c603b0..bcc2c661b741 100644
--- a/winsup/cygwin/release/3.5.5
+++ b/winsup/cygwin/release/3.5.5
@@ -10,3 +10,5 @@ Fixes:
 
 - Fix pread() and pwrite() EBADF error after fork().
   Addresses: https://sourceware.org/pipermail/cygwin/2024-September/256468.html
+
+- Fix timer_delete() return value which always indicated failure.


More information about the Cygwin-cvs mailing list