From: Rémi Denis-Courmont <rdenis@simphalempin.com>
Date: Tue, 5 Aug 2008 18:44:47 +0000 (+0300)
Subject: More natural prototype for vlc_savecancel
X-Git-Tag: 1.0.0-pre1~3773
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=12d0d264c41ad48bc55f91bb32ab8b64fe1d268d;p=vlc

More natural prototype for vlc_savecancel
---

diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index c2dd3030a8..8796d6ccae 100644
--- a/include/vlc_threads.h
+++ b/include/vlc_threads.h
@@ -603,16 +603,17 @@ VLC_EXPORT (void, vlc_control_cancel, (int cmd, ...));
  * Save the cancellation state and disable cancellation for the calling thread.
  * This function must be called before entering a piece of code that is not
  * cancellation-safe.
- * @param p_state storage for the previous cancellation state
- * @return Nothing, always succeeds.
+ * @return Previous cancellation state (opaque value).
  */
-static inline void vlc_savecancel (int *p_state)
+static inline int vlc_savecancel (void)
 {
+    int state;
 #if defined (LIBVLC_USE_PTHREAD)
-    (void) pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, p_state);
+    (void) pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state);
 #else
-    vlc_control_cancel (VLC_SAVE_CANCEL, p_state);
+    vlc_control_cancel (VLC_SAVE_CANCEL, &state);
 #endif
+    return state;
 }
 
 /**