[vlc-devel] commit: Remove dead code (vlc_object_timedwait) ( Rémi Denis-Courmont )

git version control git at videolan.org
Mon Sep 8 22:14:04 CEST 2008


vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Mon Sep  8 23:01:15 2008 +0300| [4f407b68ee89c3df73fdc7967d6baade8f0cc3d2] | committer: Rémi Denis-Courmont 

Remove dead code (vlc_object_timedwait)

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

 include/vlc_objects.h |    4 ----
 src/libvlccore.sym    |    1 -
 src/misc/objects.c    |   16 ----------------
 3 files changed, 0 insertions(+), 21 deletions(-)

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 67f26da..6e9b66a 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 27e8df2..c10802c 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 4a9f75a..2db5941 100644
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -482,22 +482,6 @@ void __vlc_object_wait( vlc_object_t *obj )
 
 
 /**
- * Same as vlc_object_wait(), with an additional time-out.
- *
- * @param deadline <b>absolute</b> 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.
  *




More information about the vlc-devel mailing list