X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmisc%2Flua%2Fextension.c;h=498f50c9641b0b7b8a10366422f6869f644f37cb;hb=e20a107d1aae63efe536c863e9e9d4692da86e45;hp=7fa4ca2fc2b3f38d5871f84da2008973c3f74e29;hpb=28ad9041168d7e09b58705ad1f885b068b014208;p=vlc diff --git a/modules/misc/lua/extension.c b/modules/misc/lua/extension.c index 7fa4ca2fc2..498f50c964 100644 --- a/modules/misc/lua/extension.c +++ b/modules/misc/lua/extension.c @@ -342,61 +342,31 @@ 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 = strdup( luaL_optstring( L, -1, NULL ) ); 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 = strdup( luaL_optstring( L, -1, NULL ) ); 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 = strdup( luaL_optstring( L, -1, NULL ) ); 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 = strdup( luaL_optstring( L, -1, NULL ) ); 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 = strdup( luaL_optstring( L, -1, NULL ) ); lua_pop( L, 1 ); } else