vlc | branch: master | Rémi Duraffort <[email protected]> | Sun Sep 26 12:05:38 2010 +0200| [e20a107d1aae63efe536c863e9e9d4692da86e45] | committer: Rémi Duraffort
lua_extension: factorize. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e20a107d1aae63efe536c863e9e9d4692da86e45 --- modules/misc/lua/extension.c | 40 +++++----------------------------------- 1 files changed, 5 insertions(+), 35 deletions(-) diff --git a/modules/misc/lua/extension.c b/modules/misc/lua/extension.c index 7fa4ca2..498f50c 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 _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
