X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmisc%2Flua%2Fextension.c;h=745350fdeeb7b2d6363c8c784f1a3e244e6bab6f;hb=c04668ad5effb61eda668b293aa9aa8e161d369e;hp=fe4e2f2ce98ccc964e39a8d2e435624f931ba353;hpb=b318bfb3d71139b337cd61f4b9e146b59545a3c9;p=vlc diff --git a/modules/misc/lua/extension.c b/modules/misc/lua/extension.c index fe4e2f2ce9..745350fdee 100644 --- a/modules/misc/lua/extension.c +++ b/modules/misc/lua/extension.c @@ -341,62 +341,27 @@ 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_checkstring( L, -1 ) ); - } - else - { - p_ext->psz_author = NULL; - } + p_ext->psz_author = luaL_strdupornull( L, -1 ); lua_pop( L, 1 ); /* Get description */ lua_getfield( L, -1, "description" ); - if( lua_isstring( L, -1 ) ) - { - p_ext->psz_description = strdup( luaL_checkstring( L, -1 ) ); - } - else - { - p_ext->psz_description = NULL; - } + p_ext->psz_description = luaL_strdupornull( L, -1 ); lua_pop( L, 1 ); /* Get short description */ lua_getfield( L, -1, "shortdesc" ); - if( lua_isstring( L, -1 ) ) - { - p_ext->psz_shortdescription = strdup( luaL_checkstring( L, -1 ) ); - } - else - { - p_ext->psz_shortdescription = NULL; - } + p_ext->psz_shortdescription = luaL_strdupornull( L, -1 ); lua_pop( L, 1 ); /* Get URL */ lua_getfield( L, -1, "url" ); - if( lua_isstring( L, -1 ) ) - { - p_ext->psz_url = strdup( luaL_checkstring( L, -1 ) ); - } - else - { - p_ext->psz_url = NULL; - } + p_ext->psz_url = luaL_strdupornull( L, -1 ); lua_pop( L, 1 ); /* Get version */ lua_getfield( L, -1, "version" ); - if( lua_isstring( L, -1 ) ) - { - p_ext->psz_version = strdup( luaL_checkstring( L, -1 ) ); - } - else - { - p_ext->psz_version = NULL; - } + p_ext->psz_version = luaL_strdupornull( L, -1 ); lua_pop( L, 1 ); } else