From: Rémi Duraffort <ivoire@videolan.org>
Date: Wed, 29 Sep 2010 17:59:30 +0000 (+0200)
Subject: Revert "lua_extension: factorize."
X-Git-Tag: 1.2.0-pre1~5207
X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=b318bfb3d71139b337cd61f4b9e146b59545a3c9

Revert "lua_extension: factorize."

This reverts commit e20a107d1aae63efe536c863e9e9d4692da86e45.
---

diff --git a/modules/misc/lua/extension.c b/modules/misc/lua/extension.c
index 2a529b85a5..fe4e2f2ce9 100644
--- a/modules/misc/lua/extension.c
+++ b/modules/misc/lua/extension.c
@@ -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