lua_extension: factorize.

[vlc] / modules / misc / lua / extension.c

diff --git a/modules/misc/lua/extension.c b/modules/misc/lua/extension.c
index 1634d06f5de4446e8b8a5ca3502f54fb7cbb7019..498f50c9641b0b7b8a10366422f6869f644f37cb 100644 (file)
--- a/modules/misc/lua/extension.c
+++ b/modules/misc/lua/extension.c
@@ -266,14 +266,14 @@ int ScanLuaCallback( vlc_object_t *p_this, const char *psz_script,
 
     if( !lua_isfunction( L, -1 ) )
     {
-        msg_Warn( p_mgr, "Error while runing script %s, "
+        msg_Warn( p_mgr, "Error while running script %s, "
                   "function descriptor() not found", psz_script );
         goto exit;
     }
 
     if( lua_pcall( L, 0, 1, 0 ) )
     {
-        msg_Warn( p_mgr, "Error while runing script %s, "
+        msg_Warn( p_mgr, "Error while running script %s, "
                   "function descriptor(): %s", psz_script,
                   lua_tostring( L, lua_gettop( L ) ) );
         goto exit;
@@ -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
@@ -656,14 +626,14 @@ static int GetMenuEntries( extensions_manager_t *p_mgr, extension_t *p_ext,
 
     if( !lua_isfunction( L, -1 ) )
     {
-        msg_Warn( p_mgr, "Error while runing script %s, "
+        msg_Warn( p_mgr, "Error while running script %s, "
                   "function menu() not found", p_ext->psz_name );
         goto exit;
     }
 
     if( lua_pcall( L, 0, 1, 0 ) )
     {
-        msg_Warn( p_mgr, "Error while runing script %s, "
+        msg_Warn( p_mgr, "Error while running script %s, "
                   "function menu(): %s", p_ext->psz_name,
                   lua_tostring( L, lua_gettop( L ) ) );
         goto exit;
@@ -828,7 +798,7 @@ int lua_ExecuteFunctionVa( extensions_manager_t *p_mgr, extension_t *p_ext,
 
     if( !lua_isfunction( L, -1 ) )
     {
-        msg_Warn( p_mgr, "Error while runing script %s, "
+        msg_Warn( p_mgr, "Error while running script %s, "
                   "function %s() not found", p_ext->psz_name, psz_function );
         goto exit;
     }
@@ -854,7 +824,7 @@ int lua_ExecuteFunctionVa( extensions_manager_t *p_mgr, extension_t *p_ext,
     }
     if( lua_pcall( L, i_args, 1, 0 ) )
     {
-        msg_Warn( p_mgr, "Error while runing script %s, "
+        msg_Warn( p_mgr, "Error while running script %s, "
                   "function %s(): %s", p_ext->psz_name, psz_function,
                   lua_tostring( L, lua_gettop( L ) ) );
         goto exit;
@@ -885,7 +855,7 @@ int lua_ExtensionTriggerMenu( extensions_manager_t *p_mgr,
     lua_getglobal( L, "trigger_menu" );
     if( !lua_isfunction( L, -1 ) )
     {
-        msg_Warn( p_mgr, "Error while runing script %s, "
+        msg_Warn( p_mgr, "Error while running script %s, "
                   "function trigger_menu() not found", p_ext->psz_name );
         return VLC_EGENERIC;
     }
@@ -895,7 +865,7 @@ int lua_ExtensionTriggerMenu( extensions_manager_t *p_mgr,
 
     if( lua_pcall( L, 1, 1, 0 ) != 0 )
     {
-        msg_Warn( p_mgr, "Error while runing script %s, "
+        msg_Warn( p_mgr, "Error while running script %s, "
                   "function trigger_menu(): %s", p_ext->psz_name,
                   lua_tostring( L, lua_gettop( L ) ) );
         return VLC_EGENERIC;