From 7f2c9f9cc2aa65675cf9ff56f8714517a0d62a35 Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <rdenis@simphalempin.com>
Date: Sat, 30 Aug 2008 10:28:26 +0300
Subject: [PATCH] Remove vlc_threadobj (did not work properly anymore)

---
 src/libvlc.h       |  1 -
 src/misc/objects.c | 19 ++++---------------
 src/misc/threads.c | 21 ---------------------
 3 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/src/libvlc.h b/src/libvlc.h
index b934f0addb..d110a76427 100644
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -45,7 +45,6 @@ void system_End       ( libvlc_int_t * );
  */
 int vlc_threads_init( void );
 void vlc_threads_end( void );
-vlc_object_t *vlc_threadobj (void);
 
 /* Hopefully, no need to export this. There is a new thread API instead. */
 void vlc_thread_cancel (vlc_object_t *);
diff --git a/src/misc/objects.c b/src/misc/objects.c
index 6244439426..58140dd3c8 100644
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -594,17 +594,9 @@ void * vlc_object_get( int i_id )
     libvlc_global_data_t *p_libvlc_global = vlc_global();
     vlc_object_t *obj = NULL;
 #ifndef NDEBUG
-    vlc_object_t *caller = vlc_threadobj ();
-
-    if (caller)
-        msg_Dbg (caller, "uses deprecated vlc_object_get(%d)", i_id);
-    else
-    {
-        int canc = vlc_savecancel ();
-        fprintf (stderr, "main thread uses deprecated vlc_object_get(%d)\n",
-                 i_id);
-        vlc_restorecancel (canc);
-    }
+    int canc = vlc_savecancel ();
+    fprintf (stderr, "Use of deprecated vlc_object_get(%d)\n", i_id);
+    vlc_restorecancel (canc);
 #endif
     vlc_mutex_lock( &structure_lock );
 
@@ -620,10 +612,7 @@ void * vlc_object_get( int i_id )
     }
     obj = NULL;
 #ifndef NDEBUG
-    if (caller)
-        msg_Warn (caller, "wants non-existing object %d", i_id);
-    else
-        fprintf (stderr, "main thread wants non-existing object %d\n", i_id);
+    fprintf (stderr, "Object %d does not exist\n", i_id);
 #endif
 out:
     vlc_mutex_unlock( &structure_lock );
diff --git a/src/misc/threads.c b/src/misc/threads.c
index 4480e41de1..133c695471 100644
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -66,18 +66,6 @@ libvlc_global_data_t *vlc_global( void )
     return p_root;
 }
 
-#ifndef NDEBUG
-/**
- * Object running the current thread
- */
-static vlc_threadvar_t thread_object_key;
-
-vlc_object_t *vlc_threadobj (void)
-{
-    return vlc_threadvar_get (&thread_object_key);
-}
-#endif
-
 vlc_threadvar_t msg_context_global_key;
 
 #if defined(LIBVLC_USE_PTHREAD)
@@ -190,9 +178,6 @@ int vlc_threads_init( void )
         }
 
         /* We should be safe now. Do all the initialization stuff we want. */
-#ifndef NDEBUG
-        vlc_threadvar_create( &thread_object_key, NULL );
-#endif
         vlc_threadvar_create( &msg_context_global_key, msg_StackDestroy );
 #ifndef LIBVLC_USE_PTHREAD_CANCEL
         vlc_threadvar_create( &cancel_key, free );
@@ -230,9 +215,6 @@ void vlc_threads_end( void )
         vlc_threadvar_delete( &cancel_key );
 #endif
         vlc_threadvar_delete( &msg_context_global_key );
-#ifndef NDEBUG
-        vlc_threadvar_delete( &thread_object_key );
-#endif
     }
     i_initializations--;
 
@@ -661,9 +643,6 @@ static void *thread_entry (void *data)
     void *(*func) (vlc_object_t *) = ((struct vlc_thread_boot *)data)->entry;
 
     free (data);
-#ifndef NDEBUG
-    vlc_threadvar_set (&thread_object_key, obj);
-#endif
     msg_Dbg (obj, "thread started");
     func (obj);
     msg_Dbg (obj, "thread ended");
-- 
2.39.2