Replace VLC_ETHREAD with VLCENOMEM.
authorRémi Denis-Courmont <remi@remlab.net>
Sun, 2 Aug 2009 16:51:59 +0000 (19:51 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Sun, 2 Aug 2009 16:51:59 +0000 (19:51 +0300)
This is consistent with existing practice inside and outside of VLC.
We really don't need a separate error code for that.

include/vlc_common.h
modules/audio_output/hd1000a.cpp
modules/audio_output/oss.c
modules/misc/gtk_main.c
modules/misc/qte_main.cpp
src/misc/error.c

index 88b938b..a70f7ef 100644 (file)
@@ -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 */
index 1b736da..e532dfa 100644 (file)
@@ -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;
index 6ee0688..aca9ec7 100644 (file)
@@ -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;
index b127e5a..5109515 100644 (file)
@@ -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++;
index 05ab4b4..1153592 100644 (file)
@@ -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++;
index bb982c4..a11639e 100644 (file)
@@ -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";