Skip to content

V
vlc-2-2
Commit b318bfb3 authored by Rémi Duraffort's avatar Rémi Duraffort
Browse files
Options

Revert "lua_extension: factorize." 

This reverts commit e20a107d.
parent ade1b3cb
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 5 deletions
modules/misc/lua/extension.c
View file @ b318bfb3
......@@ -342,31 +342,61 @@ int ScanLuaCallback( vlc_object_t *p_this, const char *psz_script,
/* Get author */
lua_getfield( L, -1, "author" );
if( lua_isstring( L, -1 ) )
p_ext->psz_author = strdup( luaL_optstring( L, -1, NULL ) );
{
p_ext->psz_author = strdup( luaL_checkstring( L, -1 ) );
}
else
{
p_ext->psz_author = NULL;
}
lua_pop( L, 1 );
/* Get description */
lua_getfield( L, -1, "description" );
if( lua_isstring( L, -1 ) )
p_ext->psz_description = strdup( luaL_optstring( L, -1, NULL ) );
{
p_ext->psz_description = strdup( luaL_checkstring( L, -1 ) );
}
else
{
p_ext->psz_description = NULL;
}
lua_pop( L, 1 );
/* Get short description */
lua_getfield( L, -1, "shortdesc" );
if( lua_isstring( L, -1 ) )
p_ext->psz_shortdescription = strdup( luaL_optstring( L, -1, NULL ) );
{
p_ext->psz_shortdescription = strdup( luaL_checkstring( L, -1 ) );
}
else
{
p_ext->psz_shortdescription = NULL;
}
lua_pop( L, 1 );
/* Get URL */
lua_getfield( L, -1, "url" );
if( lua_isstring( L, -1 ) )
p_ext->psz_url = strdup( luaL_optstring( L, -1, NULL ) );
{
p_ext->psz_url = strdup( luaL_checkstring( L, -1 ) );
}
else
{
p_ext->psz_url = NULL;
}
lua_pop( L, 1 );
/* Get version */
lua_getfield( L, -1, "version" );
if( lua_isstring( L, -1 ) )
p_ext->psz_version = strdup( luaL_optstring( L, -1, NULL ) );
{
p_ext->psz_version = strdup( luaL_checkstring( L, -1 ) );
}
else
{
p_ext->psz_version = NULL;
}
lua_pop( L, 1 );
}
else
......
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