[vlc-devel] commit: Remove unneeded msg_Error. ( Rémi Duraffort )
git version control
git at videolan.org
Sun Jun 22 21:39:28 CEST 2008
vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Sat Jun 21 20:12:25 2008 +0200| [172e22c2f2b4abbdfee50d9fe8aaaede4b405c76]
Remove unneeded msg_Error.
Fix a potential segfault.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=172e22c2f2b4abbdfee50d9fe8aaaede4b405c76
---
modules/access/smb.c | 1 -
modules/access_output/bonjour.c | 12 ------------
modules/access_output/http.c | 3 ---
modules/access_output/shout.c | 3 ++-
modules/demux/nsc.c | 4 ----
modules/demux/ts.c | 1 -
modules/misc/svg.c | 12 ------------
modules/misc/win32text.c | 3 ---
modules/packetizer/mpeg4audio.c | 5 +----
modules/packetizer/mpeg4video.c | 5 +----
modules/video_output/msw/events.c | 3 ---
11 files changed, 4 insertions(+), 48 deletions(-)
diff --git a/modules/access/smb.c b/modules/access/smb.c
index 86308e5..3f21b6b 100644
--- a/modules/access/smb.c
+++ b/modules/access/smb.c
@@ -216,7 +216,6 @@ static int Open( vlc_object_t *p_this )
#ifdef USE_CTX
if( !(p_smb = smbc_new_context()) )
{
- msg_Err( p_access, "out of memory" );
free( psz_uri );
return VLC_ENOMEM;
}
diff --git a/modules/access_output/bonjour.c b/modules/access_output/bonjour.c
index d02240b..aab2c70 100644
--- a/modules/access_output/bonjour.c
+++ b/modules/access_output/bonjour.c
@@ -201,10 +201,7 @@ void *bonjour_start_service( vlc_object_t *p_log, const char *psz_stype,
p_sys = (bonjour_t *)malloc( sizeof(*p_sys) );
if( p_sys == NULL )
- {
- msg_Err( p_log, "out of memory" );
return NULL;
- }
memset( p_sys, 0, sizeof(*p_sys) );
@@ -214,19 +211,13 @@ void *bonjour_start_service( vlc_object_t *p_log, const char *psz_stype,
p_sys->psz_name = avahi_strdup( psz_name );
p_sys->psz_stype = avahi_strdup( psz_stype );
if( p_sys->psz_name == NULL || p_sys->psz_stype == NULL )
- {
- msg_Err( p_sys->p_log, "out of memory" );
goto error;
- }
if( psz_txt != NULL )
{
p_sys->psz_txt = avahi_strdup( psz_txt );
if( p_sys->psz_txt == NULL )
- {
- msg_Err( p_sys->p_log, "out of memory" );
goto error;
- }
}
p_sys->simple_poll = avahi_simple_poll_new();
@@ -251,10 +242,7 @@ void *bonjour_start_service( vlc_object_t *p_log, const char *psz_stype,
p_sys->poll_thread = vlc_object_create( p_sys->p_log,
sizeof(poll_thread_t) );
if( p_sys->poll_thread == NULL )
- {
- msg_Err( p_sys->p_log, "out of memory" );
goto error;
- }
p_sys->poll_thread->simple_poll = p_sys->simple_poll;
if( vlc_thread_create( p_sys->poll_thread, "Avahi Poll Iterate Thread",
diff --git a/modules/access_output/http.c b/modules/access_output/http.c
index 8b9c16b..cdf7bf4 100644
--- a/modules/access_output/http.c
+++ b/modules/access_output/http.c
@@ -171,10 +171,7 @@ static int Open( vlc_object_t *p_this )
if( !( p_sys = p_access->p_sys =
malloc( sizeof( sout_access_out_sys_t ) ) ) )
- {
- msg_Err( p_access, "Not enough memory" );
return VLC_ENOMEM ;
- }
config_ChainParse( p_access, SOUT_CFG_PREFIX, ppsz_sout_options, p_access->p_cfg );
diff --git a/modules/access_output/shout.c b/modules/access_output/shout.c
index e6374aa..58171af 100644
--- a/modules/access_output/shout.c
+++ b/modules/access_output/shout.c
@@ -184,6 +184,8 @@ static int Open( vlc_object_t *p_this )
config_ChainParse( p_access, SOUT_CFG_PREFIX, ppsz_sout_options, p_access->p_cfg );
psz_accessname = psz_parser = strdup( p_access->psz_path );
+ if( !psz_parser )
+ return VLC_ENOMEM;
if( !p_access->psz_path )
{
@@ -212,7 +214,6 @@ static int Open( vlc_object_t *p_this )
p_sys = p_access->p_sys = malloc( sizeof( sout_access_out_sys_t ) );
if( !p_sys )
{
- msg_Err( p_access, "out of memory" );
free( psz_accessname );
return VLC_ENOMEM;
}
diff --git a/modules/demux/nsc.c b/modules/demux/nsc.c
index 2c44dcb..c889af9 100644
--- a/modules/demux/nsc.c
+++ b/modules/demux/nsc.c
@@ -213,10 +213,7 @@ static char *nscdec( vlc_object_t *p_demux, char* p_encoded )
buf16_size = length;
buf16 = malloc( buf16_size );
if( buf16 == NULL )
- {
- msg_Err( p_demux, "out of memory" );
return NULL;
- }
for( i = 0; i < length; i++ )
{
@@ -232,7 +229,6 @@ static char *nscdec( vlc_object_t *p_demux, char* p_encoded )
buf8 = malloc( buf8_size + 1 );
if( buf8 == NULL )
{
- msg_Err( p_demux, "out of memory" );
free( buf16 );
return NULL;
}
diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index a6b0fe9..3dde939 100644
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -728,7 +728,6 @@ static int Open( vlc_object_t *p_this )
prg = malloc( sizeof( ts_prg_psi_t ) );
if( !prg )
{
- msg_Err( p_demux, "out of memory" );
Close( VLC_OBJECT(p_demux) );
return VLC_ENOMEM;
}
diff --git a/modules/misc/svg.c b/modules/misc/svg.c
index 9d024a6..02ad4e1 100644
--- a/modules/misc/svg.c
+++ b/modules/misc/svg.c
@@ -131,16 +131,12 @@ static int Create( vlc_object_t *p_this )
/* Allocate structure */
p_sys = malloc( sizeof( filter_sys_t ) );
if( !p_sys )
- {
- msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
- }
/* Initialize psz_template */
p_sys->psz_template = svg_GetTemplate( p_this );
if( !p_sys->psz_template )
{
- msg_Err( p_filter, "out of memory" );
free( p_sys );
return VLC_ENOMEM;
}
@@ -204,10 +200,7 @@ static char *svg_GetTemplate( vlc_object_t *p_this )
psz_template = malloc( ( s.st_size + 42 ) * sizeof( char ) );
if( !psz_template )
- {
- msg_Err( p_filter, "out of memory" );
return NULL;
- }
memset( psz_template, 0, s.st_size + 1 );
fread( psz_template, s.st_size, 1, file );
fclose( file );
@@ -451,10 +444,7 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
p_svg = ( svg_rendition_t * )malloc( sizeof( svg_rendition_t ) );
if( !p_svg )
- {
- msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
- }
p_region_out->i_x = p_region_in->i_x;
p_region_out->i_y = p_region_in->i_y;
@@ -467,7 +457,6 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
p_svg->psz_text = strdup( psz_string );
if( !p_svg->psz_text )
{
- msg_Err( p_filter, "out of memory" );
free( p_svg );
return VLC_ENOMEM;
}
@@ -482,7 +471,6 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
p_svg->psz_text = malloc( ( length + 1 ) * sizeof( char ) );
if( !p_svg->psz_text )
{
- msg_Err( p_filter, "out of memory" );
free( p_svg );
return VLC_ENOMEM;
}
diff --git a/modules/misc/win32text.c b/modules/misc/win32text.c
index 98a7d87..6318570 100644
--- a/modules/misc/win32text.c
+++ b/modules/misc/win32text.c
@@ -151,10 +151,7 @@ static int Create( vlc_object_t *p_this )
/* Allocate structure */
p_filter->p_sys = p_sys = malloc( sizeof( filter_sys_t ) );
if( !p_sys )
- {
- msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
- }
p_sys->i_font_size = 0;
p_sys->i_display_height = 0;
diff --git a/modules/packetizer/mpeg4audio.c b/modules/packetizer/mpeg4audio.c
index 2202bbf..9a926ac 100644
--- a/modules/packetizer/mpeg4audio.c
+++ b/modules/packetizer/mpeg4audio.c
@@ -203,10 +203,7 @@ static int OpenPacketizer( vlc_object_t *p_this )
/* Allocate the memory needed to store the decoder's structure */
if( ( p_dec->p_sys = p_sys =
(decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL )
- {
- msg_Err( p_dec, "out of memory" );
- return VLC_EGENERIC;
- }
+ return VLC_ENOMEM;
/* Misc init */
p_sys->i_state = STATE_NOSYNC;
diff --git a/modules/packetizer/mpeg4video.c b/modules/packetizer/mpeg4video.c
index 95c72e6..449ec36 100644
--- a/modules/packetizer/mpeg4video.c
+++ b/modules/packetizer/mpeg4video.c
@@ -160,10 +160,7 @@ static int Open( vlc_object_t *p_this )
/* Allocate the memory needed to store the decoder's structure */
if( ( p_dec->p_sys = p_sys = malloc( sizeof(decoder_sys_t) ) ) == NULL )
- {
- msg_Err( p_dec, "out of memory" );
- return VLC_EGENERIC;
- }
+ return VLC_ENOMEM;
memset( p_sys, 0, sizeof(decoder_sys_t) );
/* Misc init */
diff --git a/modules/video_output/msw/events.c b/modules/video_output/msw/events.c
index 5467ca5..5a4eecd 100644
--- a/modules/video_output/msw/events.c
+++ b/modules/video_output/msw/events.c
@@ -113,10 +113,7 @@ void EventThread( event_thread_t *p_event )
/* Creating a window under Windows also initializes the thread's event
* message queue */
if( DirectXCreateWindow( p_event->p_vout ) )
- {
- msg_Err( p_event, "out of memory" );
p_event->b_dead = true;
- }
/* Signal the creation of the window */
vlc_thread_ready( p_event );
More information about the vlc-devel
mailing list