From 4f407b68ee89c3df73fdc7967d6baade8f0cc3d2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Mon, 8 Sep 2008 23:01:15 +0300 Subject: [PATCH] Remove dead code (vlc_object_timedwait) --- include/vlc_objects.h | 4 ---- src/libvlccore.sym | 1 - src/misc/objects.c | 16 ---------------- 3 files changed, 21 deletions(-) diff --git a/include/vlc_objects.h b/include/vlc_objects.h index 67f26da1f7..6e9b66a3ea 100644 --- a/include/vlc_objects.h +++ b/include/vlc_objects.h @@ -137,10 +137,6 @@ VLC_EXPORT( void, __vlc_object_wait, ( vlc_object_t * ) ); #define vlc_object_wait( obj ) \ __vlc_object_wait( VLC_OBJECT( obj ) ) -VLC_EXPORT( int, __vlc_object_timedwait, ( vlc_object_t *, mtime_t ) ); -#define vlc_object_timedwait( obj, d ) \ - __vlc_object_timedwait( VLC_OBJECT( obj ), check_deadline(d) ) - VLC_EXPORT( void, __vlc_object_signal_unlocked, ( vlc_object_t * ) ); #define vlc_object_signal_unlocked( obj ) \ __vlc_object_signal_unlocked( VLC_OBJECT( obj ) ) diff --git a/src/libvlccore.sym b/src/libvlccore.sym index 27e8df2083..c10802c4cc 100644 --- a/src/libvlccore.sym +++ b/src/libvlccore.sym @@ -482,7 +482,6 @@ __vlc_object_lock __vlc_object_release __vlc_object_set_destructor __vlc_object_signal_unlocked -__vlc_object_timedwait __vlc_object_unlock __vlc_object_wait __vlc_object_waitpipe diff --git a/src/misc/objects.c b/src/misc/objects.c index 4a9f75ad94..2db5941bd5 100644 --- a/src/misc/objects.c +++ b/src/misc/objects.c @@ -481,22 +481,6 @@ void __vlc_object_wait( vlc_object_t *obj ) } -/** - * Same as vlc_object_wait(), with an additional time-out. - * - * @param deadline absolute time-out (using the same clock as mdate()) - * - * @return 0 if the object was signaled before the timer expiration, or - * ETIMEDOUT if the timer expired without any signal. - */ -int __vlc_object_timedwait( vlc_object_t *obj, mtime_t deadline ) -{ - vlc_object_internals_t *priv = vlc_internals( obj ); - vlc_assert_locked( &priv->lock); - return vlc_cond_timedwait( &priv->wait, &priv->lock, deadline ); -} - - /** * Wakes up one thread waiting on the object. If no thread are (yet) waiting, * nothing happens. -- 2.39.2