From: Rémi Duraffort <ivoire@videolan.org>
Date: Mon, 13 Sep 2010 18:19:44 +0000 (+0200)
Subject: lua: remove "bla ? true : false"
X-Git-Tag: 1.2.0-pre1~5275
X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=498262cef5133af555f2ce8a8efd775aa163c41b

lua: remove "bla ? true : false"
---

diff --git a/modules/misc/lua/libs/acl.c b/modules/misc/lua/libs/acl.c
index bbe0c8605b..4deb66e6dd 100644
--- a/modules/misc/lua/libs/acl.c
+++ b/modules/misc/lua/libs/acl.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * acl.c: Access list related functions
  *****************************************************************************
- * Copyright (C) 2007-2008 the VideoLAN team
+ * Copyright (C) 2007-2010 the VideoLAN team
  * $Id$
  *
  * Authors: Antoine Cellerier <dionoea at videolan tod org>
@@ -64,7 +64,7 @@ static const luaL_Reg vlclua_acl_reg[] = {
 static int vlclua_acl_create( lua_State *L )
 {
     vlc_object_t *p_this = vlclua_get_this( L );
-    bool b_allow = luaL_checkboolean( L, 1 ) ? true : false;
+    bool b_allow = luaL_checkboolean( L, 1 );
     vlc_acl_t *p_acl = ACL_Create( p_this, b_allow );
     return vlclua_acl_create_inner( L, p_acl );
 }
@@ -117,7 +117,7 @@ static int vlclua_acl_add_host( lua_State *L )
 {
     vlc_acl_t **pp_acl = (vlc_acl_t**)luaL_checkudata( L, 1, "acl" );
     const char *psz_ip = luaL_checkstring( L, 2 );
-    bool b_allow = luaL_checkboolean( L, 3 ) ? true : false;
+    bool b_allow = luaL_checkboolean( L, 3 );
     lua_pushinteger( L, ACL_AddHost( *pp_acl, psz_ip, b_allow ) );
     return 1;
 }
@@ -127,7 +127,7 @@ static int vlclua_acl_add_net( lua_State *L )
     vlc_acl_t **pp_acl = (vlc_acl_t**)luaL_checkudata( L, 1, "acl" );
     const char *psz_ip = luaL_checkstring( L, 2 );
     int i_len = luaL_checkint( L, 3 );
-    bool b_allow = luaL_checkboolean( L, 4 ) ? true : false;
+    bool b_allow = luaL_checkboolean( L, 4 );
     lua_pushinteger( L, ACL_AddNet( *pp_acl, psz_ip, i_len, b_allow ) );
     return 1;
 }
diff --git a/modules/misc/lua/libs/variables.c b/modules/misc/lua/libs/variables.c
index 820092f54c..f0b1cbf303 100644
--- a/modules/misc/lua/libs/variables.c
+++ b/modules/misc/lua/libs/variables.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * variables.c: Generic lua<->vlc variables interface
  *****************************************************************************
- * Copyright (C) 2007-2008 the VideoLAN team
+ * Copyright (C) 2007-2010 the VideoLAN team
  * $Id$
  *
  * Authors: Antoine Cellerier <dionoea at videolan tod org>
@@ -257,7 +257,7 @@ int __vlclua_var_toggle_or_set( lua_State *L, vlc_object_t *p_obj,
         b_bool = !var_GetBool( p_obj, psz_name );
     else /* lua_gettop( L ) == 1 */
     {
-        b_bool = luaL_checkboolean( L, -1 )?true:false;
+        b_bool = luaL_checkboolean( L, -1 );
         lua_pop( L, 1 );
     }