Commit 35d52735 authored by dionoea's avatar dionoea

Simplify and hopefully fix compilation :)

parent 80660f17
...@@ -140,7 +140,6 @@ static int probe_luascript( vlc_object_t *p_this, const char * psz_filename, ...@@ -140,7 +140,6 @@ static int probe_luascript( vlc_object_t *p_this, const char * psz_filename,
{ {
msg_Warn( p_demux, "Error loading script %s: %s", psz_filename, msg_Warn( p_demux, "Error loading script %s: %s", psz_filename,
lua_tostring( L, lua_gettop( L ) ) ); lua_tostring( L, lua_gettop( L ) ) );
lua_pop( L, 1 );
goto error; goto error;
} }
...@@ -150,9 +149,7 @@ static int probe_luascript( vlc_object_t *p_this, const char * psz_filename, ...@@ -150,9 +149,7 @@ static int probe_luascript( vlc_object_t *p_this, const char * psz_filename,
{ {
msg_Warn( p_demux, "Error while runing script %s, " msg_Warn( p_demux, "Error while runing script %s, "
"function probe() not found", psz_filename ); "function probe() not found", psz_filename );
lua_pop( L, 1 );
goto error; goto error;
return VLC_EGENERIC;
} }
if( lua_pcall( L, 0, 1, 0 ) ) if( lua_pcall( L, 0, 1, 0 ) )
...@@ -160,9 +157,7 @@ static int probe_luascript( vlc_object_t *p_this, const char * psz_filename, ...@@ -160,9 +157,7 @@ static int probe_luascript( vlc_object_t *p_this, const char * psz_filename,
msg_Warn( p_demux, "Error while runing script %s, " msg_Warn( p_demux, "Error while runing script %s, "
"function probe(): %s", psz_filename, "function probe(): %s", psz_filename,
lua_tostring( L, lua_gettop( L ) ) ); lua_tostring( L, lua_gettop( L ) ) );
lua_pop( L, 1 );
goto error; goto error;
return VLC_EGENERIC;
} }
if( lua_gettop( L ) ) if( lua_gettop( L ) )
...@@ -174,11 +169,11 @@ static int probe_luascript( vlc_object_t *p_this, const char * psz_filename, ...@@ -174,11 +169,11 @@ static int probe_luascript( vlc_object_t *p_this, const char * psz_filename,
lua_pop( L, 1 ); lua_pop( L, 1 );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
lua_pop( L, 1 );
} }
error: error:
FREENULL( p_sys->psz_filename ); lua_pop( L, 1 );
FREENULL( p_demux->p_sys->psz_filename );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment