[vlc-commits] clock: don't return an error in vlc_clock_Wait()

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Aug 12 09:08:48 2020 +0200| [5851986b6f4d35f0bc14ef17cff2d3490f94b544] | committer: Steve Lhomme

clock: don't return an error in vlc_clock_Wait()

Callers never use it and probably won't do much about it.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5851986b6f4d35f0bc14ef17cff2d3490f94b544
---

 src/clock/clock.c | 8 ++------
 src/clock/clock.h | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/clock/clock.c b/src/clock/clock.c
index e6c126d1c0..f5c0583e84 100644
--- a/src/clock/clock.c
+++ b/src/clock/clock.c
@@ -336,7 +336,7 @@ static vlc_tick_t vlc_clock_slave_set_delay(vlc_clock_t *clock, vlc_tick_t delay
     return 0;
 }
 
-int vlc_clock_Wait(vlc_clock_t *clock, vlc_tick_t system_now, vlc_tick_t ts,
+void vlc_clock_Wait(vlc_clock_t *clock, vlc_tick_t system_now, vlc_tick_t ts,
                    double rate, vlc_tick_t max_duration)
 {
     vlc_clock_main_t *main_clock = clock->owner;
@@ -353,13 +353,9 @@ int vlc_clock_Wait(vlc_clock_t *clock, vlc_tick_t system_now, vlc_tick_t ts,
         deadline = __MIN(deadline, max_deadline);
 
         if (vlc_cond_timedwait(&main_clock->cond, &main_clock->lock, deadline))
-        {
-            vlc_mutex_unlock(&main_clock->lock);
-            return 0;
-        }
+            break;
     }
     vlc_mutex_unlock(&main_clock->lock);
-    return -1;
 }
 
 vlc_clock_main_t *vlc_clock_main_New(void)
diff --git a/src/clock/clock.h b/src/clock/clock.h
index 87faab165e..948aa59d67 100644
--- a/src/clock/clock.h
+++ b/src/clock/clock.h
@@ -167,7 +167,7 @@ vlc_tick_t vlc_clock_SetDelay(vlc_clock_t *clock, vlc_tick_t ts_delay);
 /**
  * Wait for a timestamp expressed in stream time
  */
-int vlc_clock_Wait(vlc_clock_t *clock, vlc_tick_t system_now, vlc_tick_t ts,
+void vlc_clock_Wait(vlc_clock_t *clock, vlc_tick_t system_now, vlc_tick_t ts,
                    double rate, vlc_tick_t max_duration);
 
 /**