Replace VLC_ETHREAD with VLCENOMEM.

This is consistent with existing practice inside and outside of VLC.
We really don't need a separate error code for that.

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 88b938bc421b379ec818dcf6118c25cb054360b9..a70f7efe0f5621589b7d61e5b1a95b59f9ee009a 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -434,7 +434,6 @@ struct vlc_list_t
  *****************************************************************************/
 #define VLC_SUCCESS         -0                                   /* No error */
 #define VLC_ENOMEM          -1                          /* Not enough memory */
-#define VLC_ETHREAD         -2                               /* Thread error */
 #define VLC_ETIMEOUT        -3                                    /* Timeout */
 
 #define VLC_ENOMOD         -10                           /* Module not found */

diff --git a/modules/audio_output/hd1000a.cpp b/modules/audio_output/hd1000a.cpp
index 1b736dabc2c5871f82d57bd8cde12cf097f2e4cd..e532dfafd6e096040d6f60d2ccc8a0ecdb985bb8 100644 (file)
--- a/modules/audio_output/hd1000a.cpp
+++ b/modules/audio_output/hd1000a.cpp
@@ -175,7 +175,7 @@ static int Open( vlc_object_t * p_this )
         delete pPlayer;
         free( p_sys->ppBuffers );
         free( p_sys );
-        return VLC_ETHREAD;
+        return VLC_ENOMEM;
     }
 
     return VLC_SUCCESS;

diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index 6ee0688655bd63e73786d86170262f0b672fc5da..aca9ec7bfcba86052b555b539495afbbe352fedf 100644 (file)
--- a/modules/audio_output/oss.c
+++ b/modules/audio_output/oss.c
@@ -522,7 +522,7 @@ static int Open( vlc_object_t *p_this )
         msg_Err( p_aout, "cannot create OSS thread (%m)" );
         close( p_sys->i_fd );
         free( p_sys );
-        return VLC_ETHREAD;
+        return VLC_ENOMEM;
     }
 
     return VLC_SUCCESS;

diff --git a/modules/misc/gtk_main.c b/modules/misc/gtk_main.c
index b127e5a8f69c0e08adefb645f867b7c7a42bdc14..5109515a5b2990d60e09cbf79b1f1e54163a63be 100644 (file)
--- a/modules/misc/gtk_main.c
+++ b/modules/misc/gtk_main.c
@@ -115,7 +115,7 @@ static int Open( vlc_object_t *p_this )
         vlc_object_release( p_gtk_main );
         i_refcount--;
         vlc_mutex_unlock( &gtk_lock );
-        return VLC_ETHREAD;
+        return VLC_ENOMEM;
     }
 
     i_refcount++;

diff --git a/modules/misc/qte_main.cpp b/modules/misc/qte_main.cpp
index 05ab4b4290418d013b99e5a5591d4525582c4e74..1153592a3e0bda3994df616bd8b0d897797877bc 100644 (file)
--- a/modules/misc/qte_main.cpp
+++ b/modules/misc/qte_main.cpp
@@ -109,7 +109,7 @@ static int Open( vlc_object_t *p_this )
         vlc_object_release( p_qte_main );
         i_refcount--;
         vlc_mutex_unlock( lock );
-        return VLC_ETHREAD;
+        return VLC_ENOMEM;
     }
 
     i_refcount++;

diff --git a/src/misc/error.c b/src/misc/error.c
index bb982c49d1c98484761b7c921e2c57d6e8091879..a11639e785f647f98e703684f591f75cfffece15 100644 (file)
--- a/src/misc/error.c
+++ b/src/misc/error.c
@@ -45,8 +45,6 @@ char const * vlc_error ( int i_err )
 
         case VLC_ENOMEM:
             return "not enough memory";
-        case VLC_ETHREAD:
-            return "thread error";
         case VLC_ETIMEOUT:
             return "timeout";