[vlc-devel] commit: Remove uneeded warining (and often impossible to send) ( Rémi Duraffort )

git version control git at videolan.org
Tue Oct 14 21:01:52 CEST 2008


vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Tue Oct 14 21:01:22 2008 +0200| [a396b96cc7981eb6aee5d3fb2b8437147b645d22] | committer: Rémi Duraffort 

Remove uneeded warining (and often impossible to send)

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

 modules/access/jack.c               |    4 ++--
 modules/access/vcdx/access.c        |    8 ++------
 modules/access_output/rtmp.c        |    3 ---
 modules/codec/kate.c                |    3 ---
 modules/codec/theora.c              |    3 ---
 modules/demux/mp4/libmp4.c          |    3 ---
 modules/gui/beos/AudioOutput.cpp    |    3 ---
 modules/gui/beos/Interface.cpp      |    3 ---
 modules/gui/beos/VideoOutput.cpp    |    5 +----
 modules/gui/macosx/voutgl.m         |    3 ---
 modules/gui/minimal_macosx/voutgl.m |    3 ---
 modules/gui/pda/pda.c               |    3 ---
 modules/gui/qnx/aout.c              |    3 ---
 modules/gui/qnx/vout.c              |    9 ---------
 modules/gui/wince/wince.cpp         |    5 +----
 modules/video_filter/clone.c        |    1 -
 16 files changed, 6 insertions(+), 56 deletions(-)

diff --git a/modules/access/jack.c b/modules/access/jack.c
index d5df31d..f8ca424 100644
--- a/modules/access/jack.c
+++ b/modules/access/jack.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * jack.c: JACK audio input module
  *****************************************************************************
- * Copyright (C) 2007 the VideoLAN team
+ * Copyright (C) 2007-2008 the VideoLAN team
  * Copyright (C) 2007 Société des arts technologiques
  * Copyright (C) 2007 Savoir-faire Linux
  *
@@ -170,7 +170,7 @@ static int Open( vlc_object_t *p_this )
     }
 
     /* find some specifics ports if user entered a regexp */
-    if( p_sys->psz_ports)
+    if( p_sys->psz_ports )
     {
         Port_finder( p_demux );
         if( p_sys->i_channels == 0 )
diff --git a/modules/access/vcdx/access.c b/modules/access/vcdx/access.c
index 279c34a..ffe7f18 100644
--- a/modules/access/vcdx/access.c
+++ b/modules/access/vcdx/access.c
@@ -874,10 +874,7 @@ VCDOpen ( vlc_object_t *p_this )
     p_vcdplayer = malloc( sizeof(vcdplayer_t) );
 
     if( p_vcdplayer == NULL )
-    {
-        LOG_ERR ("out of memory" );
         return VLC_ENOMEM;
-    }
 
     p_vcdplayer->i_debug = config_GetInt( p_this, MODULE_STRING "-debug" );
     p_access->p_sys = (access_sys_t *) p_vcdplayer;
@@ -1109,9 +1106,8 @@ static int VCDControl( access_t *p_access, int i_query, va_list args )
             dbg_print( INPUT_DBG_EVENT, "GET TITLE: i_titles %d",
                        p_vcdplayer->i_titles );
 
-            if( psz_mrl == NULL ) {
-               msg_Warn( p_access, "out of memory" );
-            } else {
+            if( psz_mrl  )
+            {
                snprintf(psz_mrl, psz_mrl_max, "%s%s",
                         VCD_MRL_PREFIX, p_vcdplayer->psz_source);
                VCDMetaInfo( p_access, psz_mrl );
diff --git a/modules/access_output/rtmp.c b/modules/access_output/rtmp.c
index 8f478f5..8afbf95 100644
--- a/modules/access_output/rtmp.c
+++ b/modules/access_output/rtmp.c
@@ -99,10 +99,7 @@ static int Open( vlc_object_t *p_this )
     p_sys->p_thread =
         vlc_object_create( p_access, sizeof( rtmp_control_thread_t ) );
     if( !p_sys->p_thread )
-    {
-        msg_Err( p_access, "out of memory" );
         return VLC_ENOMEM;
-    }
     vlc_object_attach( p_sys->p_thread, p_access );
 
     /* Parse URI - remove spaces */
diff --git a/modules/codec/kate.c b/modules/codec/kate.c
index be89e97..2ce29bf 100644
--- a/modules/codec/kate.c
+++ b/modules/codec/kate.c
@@ -716,10 +716,7 @@ static void ParseKateComments( decoder_t *p_dec )
     {
         psz_comment = strdup( p_dec->p_sys->kc.user_comments[i] );
         if( !psz_comment )
-        {
-            msg_Warn( p_dec, "out of memory" );
             break;
-        }
         psz_name = psz_comment;
         psz_value = strchr( psz_comment, '=' );
         if( psz_value )
diff --git a/modules/codec/theora.c b/modules/codec/theora.c
index 88e14c0..b3d2e9e 100644
--- a/modules/codec/theora.c
+++ b/modules/codec/theora.c
@@ -520,10 +520,7 @@ static void ParseTheoraComments( decoder_t *p_dec )
     {
         psz_comment = strdup( p_dec->p_sys->tc.user_comments[i] );
         if( !psz_comment )
-        {
-            msg_Warn( p_dec, "out of memory" );
             break;
-        }
         psz_name = psz_comment;
         psz_value = strchr( psz_comment, '=' );
         if( psz_value )
diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 422f8f2..cebdd94 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -1910,10 +1910,7 @@ static int MP4_ReadBox_cmov( stream_t *p_stream, MP4_Box_t *p_box )
 #endif
 
     if( !( p_box->data.p_cmov = malloc( sizeof( MP4_Box_data_cmov_t ) ) ) )
-    {
-        msg_Err( p_stream, "out of memory" );
         return 0;
-    }
     memset( p_box->data.p_cmov, 0, sizeof( MP4_Box_data_cmov_t ) );
 
     if( !p_box->p_father ||
diff --git a/modules/gui/beos/AudioOutput.cpp b/modules/gui/beos/AudioOutput.cpp
index a65c5cc..1202ef0 100644
--- a/modules/gui/beos/AudioOutput.cpp
+++ b/modules/gui/beos/AudioOutput.cpp
@@ -69,10 +69,7 @@ int OpenAudio ( vlc_object_t * p_this )
     aout_instance_t * p_aout = (aout_instance_t*) p_this;
     p_aout->output.p_sys = (aout_sys_t*) malloc( sizeof( aout_sys_t ) );
     if( p_aout->output.p_sys == NULL )
-    {
-        msg_Err( p_aout, "out of memory" );
         return -1;
-    }
     aout_sys_t * p_sys = p_aout->output.p_sys;
 
     aout_VolumeSoftInit( p_aout );
diff --git a/modules/gui/beos/Interface.cpp b/modules/gui/beos/Interface.cpp
index c1c5f62..72c800f 100644
--- a/modules/gui/beos/Interface.cpp
+++ b/modules/gui/beos/Interface.cpp
@@ -68,10 +68,7 @@ int OpenIntf ( vlc_object_t *p_this )
     /* Allocate instance and initialize some members */
     p_intf->p_sys = (intf_sys_t*) malloc( sizeof( intf_sys_t ) );
     if( !p_intf->p_sys )
-    {
-        msg_Err( p_intf, "out of memory" );
         return VLC_EGENERIC;
-    }
  
     p_intf->pf_run = Run;
 
diff --git a/modules/gui/beos/VideoOutput.cpp b/modules/gui/beos/VideoOutput.cpp
index 8364ea1..e808b7d 100644
--- a/modules/gui/beos/VideoOutput.cpp
+++ b/modules/gui/beos/VideoOutput.cpp
@@ -1228,10 +1228,7 @@ int OpenVideo ( vlc_object_t *p_this )
     /* Allocate structure */
     p_vout->p_sys = (vout_sys_t*) malloc( sizeof( vout_sys_t ) );
     if( p_vout->p_sys == NULL )
-    {
-        msg_Err( p_vout, "out of memory" );
-        return( 1 );
-    }
+        return 1;
     p_vout->p_sys->i_width = p_vout->render.i_width;
     p_vout->p_sys->i_height = p_vout->render.i_height;
     p_vout->p_sys->source_chroma = p_vout->render.i_chroma;
diff --git a/modules/gui/macosx/voutgl.m b/modules/gui/macosx/voutgl.m
index fbdadd1..5f5f5e7 100644
--- a/modules/gui/macosx/voutgl.m
+++ b/modules/gui/macosx/voutgl.m
@@ -110,10 +110,7 @@ int OpenVideoGL  ( vlc_object_t * p_this )
 
     p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
     if( p_vout->p_sys == NULL )
-    {
-        msg_Err( p_vout, "out of memory" );
         return( 1 );
-    }
 
     memset( p_vout->p_sys, 0, sizeof( vout_sys_t ) );
 
diff --git a/modules/gui/minimal_macosx/voutgl.m b/modules/gui/minimal_macosx/voutgl.m
index 7713f53..c046268 100644
--- a/modules/gui/minimal_macosx/voutgl.m
+++ b/modules/gui/minimal_macosx/voutgl.m
@@ -49,10 +49,7 @@ int OpenVideoGL  ( vlc_object_t * p_this )
 
     p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
     if( p_vout->p_sys == NULL )
-    {
-        msg_Err( p_vout, "out of memory" );
         return( 1 );
-    }
 
     memset( p_vout->p_sys, 0, sizeof( vout_sys_t ) );
 
diff --git a/modules/gui/pda/pda.c b/modules/gui/pda/pda.c
index eede59e..e5eecb0 100644
--- a/modules/gui/pda/pda.c
+++ b/modules/gui/pda/pda.c
@@ -86,10 +86,7 @@ static int Open( vlc_object_t *p_this )
     /* Allocate instance and initialize some members */
     p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
     if( p_intf->p_sys == NULL )
-    {
-        msg_Err( p_intf, "out of memory" );
         return VLC_ENOMEM;
-    }
 
 #ifdef NEED_GTK2_MAIN
     msg_Dbg( p_intf, "Using gui-helper" );
diff --git a/modules/gui/qnx/aout.c b/modules/gui/qnx/aout.c
index 77736af..0dea8b8 100644
--- a/modules/gui/qnx/aout.c
+++ b/modules/gui/qnx/aout.c
@@ -79,10 +79,7 @@ int OpenAudio( vlc_object_t *p_this )
     /* allocate structure */
     p_aout->output.p_sys = malloc( sizeof( aout_sys_t ) );
     if( p_aout->output.p_sys == NULL )
-    {
-        msg_Err( p_aout, "out of memory" );
         return -1;
-    }
 
     /* open audio device */
     if( ( i_ret = snd_pcm_open_preferred( &p_aout->output.p_sys->p_pcm_handle,
diff --git a/modules/gui/qnx/vout.c b/modules/gui/qnx/vout.c
index bc34b1b..4b30fe0 100644
--- a/modules/gui/qnx/vout.c
+++ b/modules/gui/qnx/vout.c
@@ -144,10 +144,7 @@ int OpenVideo ( vlc_object_t *p_this )
     /* allocate structure */
     p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
     if( p_vout->p_sys == NULL )
-    {
-        msg_Err( p_vout, "out of memory" );
         return( 1 );
-    }
 
     memset( p_vout->p_sys, 0, sizeof( vout_sys_t ) );
 
@@ -309,10 +306,7 @@ static int QNXManage( vout_thread_t *p_vout )
     /* allocate buffer for event */
     i_buflen = sizeof( PhEvent_t ) * 4;
     if( ( p_event = malloc( i_buflen ) ) == NULL )
-    {
-        msg_Err( p_vout, "out of memory" );
         return( 1 );
-    }
 
     /* event loop */
     do
@@ -324,10 +318,7 @@ static int QNXManage( vout_thread_t *p_vout )
         {
             i_buflen = PhGetMsgSize( p_event );
             if( ( p_event = realloc( p_event, i_buflen ) ) == NULL )
-            {
-                msg_Err( p_vout, "out of memory" );
                 return( 1 );
-            }
         }
         else if( i_ev == Ph_EVENT_MSG )
         {
diff --git a/modules/gui/wince/wince.cpp b/modules/gui/wince/wince.cpp
index da57c3f..6886933 100644
--- a/modules/gui/wince/wince.cpp
+++ b/modules/gui/wince/wince.cpp
@@ -114,10 +114,7 @@ static int Open( vlc_object_t *p_this )
     // Allocate instance and initialize some members
     p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) );
     if( p_intf->p_sys == NULL )
-    {
-        msg_Err( p_intf, "out of memory" );
-        return VLC_EGENERIC;
-    }
+        return VLC_ENOMEM;
 
     // Suscribe to messages bank
     p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
diff --git a/modules/video_filter/clone.c b/modules/video_filter/clone.c
index 4653563..50b92af 100644
--- a/modules/video_filter/clone.c
+++ b/modules/video_filter/clone.c
@@ -201,7 +201,6 @@ static int Create( vlc_object_t *p_this )
                                      sizeof(vout_thread_t *) );
     if( p_vout->p_sys->pp_vout == NULL )
     {
-        msg_Err( p_vout, "out of memory" );
         free( p_vout->p_sys );
         return VLC_ENOMEM;
     }




More information about the vlc-devel mailing list