[vlc-devel] commit: Win32: unimplement thread result ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Aug  1 23:52:24 2009 +0300| [84a6069c3cda42e8cdec6932d0e4da9d4eec088a] | committer: Rémi Denis-Courmont 

Win32: unimplement thread result

This is never used currently. Removing it simplifies the next commits.

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

 include/vlc_threads.h |    1 -
 src/misc/w32thread.c  |    5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index 55fea78..fd00fd2 100644
--- a/include/vlc_threads.h
+++ b/include/vlc_threads.h
@@ -129,7 +129,6 @@ struct vlc_timer_t
 typedef struct
 {
     HANDLE handle;
-    void  *result;
 #if defined( UNDER_CE )
     HANDLE cancel_event;
 #endif
diff --git a/src/misc/w32thread.c b/src/misc/w32thread.c
index e0e06a7..afbacfa 100644
--- a/src/misc/w32thread.c
+++ b/src/misc/w32thread.c
@@ -427,7 +427,7 @@ static unsigned __stdcall vlc_entry (void *p)
 #endif
 
     vlc_threadvar_set (cancel_key, &cancel_data);
-    data.handle->result = data.func (data.data);
+    data.func (data.data);
     return 0;
 }
 
@@ -505,8 +505,7 @@ void vlc_join (vlc_thread_t handle, void **result)
                                                         == WAIT_IO_COMPLETION);
 
     CloseHandle (handle->handle);
-    if (result)
-        *result = handle->result;
+    assert (result == NULL); /* <- FIXME if ever needed */
 #ifdef UNDER_CE
     CloseHandle (handle->cancel_event);
 #endif