mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 09:21:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

luainstance: Fix default parameter for config file getXXX functions

Browse Source 
- Revert commit 'Fix default parameter for config file setXXX functions'


Origin commit data
------------------
Branch: ni/coolstream
Commit: b2945b1a1a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)



------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2014-09-17 20:46:47 +02:00
parent 79edd0f657
commit 07c9c4c7eb
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/gui/luainstance.cpp
View File

@@ -2385,10 +2385,13 @@ int CLuaInstance::LuaConfigFileGetString(lua_State *L)
{ {
CLuaConfigFile *c = LuaConfigFileCheck(L, 1); CLuaConfigFile *c = LuaConfigFileCheck(L, 1);
if (!c) return 0; if (!c) return 0;
int numargs = lua_gettop(L);
std::string ret; std::string ret;
const char *key = luaL_checkstring(L, 2); const char *key = luaL_checkstring(L, 2);
const char *defaultVal = luaL_checkstring(L, 3); const char *defaultVal = "";
if (numargs > 2)
defaultVal = luaL_checkstring(L, 3);
ret = c->c->getString(key, defaultVal); ret = c->c->getString(key, defaultVal);
lua_pushstring(L, ret.c_str()); lua_pushstring(L, ret.c_str());
return 1; return 1;
@@ -2398,12 +2401,9 @@ int CLuaInstance::LuaConfigFileSetString(lua_State *L)
{ {
CLuaConfigFile *c = LuaConfigFileCheck(L, 1); CLuaConfigFile *c = LuaConfigFileCheck(L, 1);
if (!c) return 0; if (!c) return 0;
int numargs = lua_gettop(L);
const char *key = luaL_checkstring(L, 2); const char *key = luaL_checkstring(L, 2);
const char *val = ""; const char *val = luaL_checkstring(L, 3);
if (numargs > 2)
val = luaL_checkstring(L, 3);
c->c->setString(key, val); c->c->setString(key, val);
return 0; return 0;
} }
@@ -2412,10 +2412,13 @@ int CLuaInstance::LuaConfigFileGetInt32(lua_State *L)
{ {
CLuaConfigFile *c = LuaConfigFileCheck(L, 1); CLuaConfigFile *c = LuaConfigFileCheck(L, 1);
if (!c) return 0; if (!c) return 0;
int numargs = lua_gettop(L);
int ret; int ret;
const char *key = luaL_checkstring(L, 2); const char *key = luaL_checkstring(L, 2);
int defaultVal = luaL_checkint(L, 3); int defaultVal = 0;
if (numargs > 2)
defaultVal = luaL_checkint(L, 3);
ret = c->c->getInt32(key, defaultVal); ret = c->c->getInt32(key, defaultVal);
lua_pushinteger(L, ret); lua_pushinteger(L, ret);
return 1; return 1;
@@ -2425,12 +2428,9 @@ int CLuaInstance::LuaConfigFileSetInt32(lua_State *L)
{ {
CLuaConfigFile *c = LuaConfigFileCheck(L, 1); CLuaConfigFile *c = LuaConfigFileCheck(L, 1);
if (!c) return 0; if (!c) return 0;
int numargs = lua_gettop(L);
const char *key = luaL_checkstring(L, 2); const char *key = luaL_checkstring(L, 2);
int val = 0; int val = luaL_checkint(L, 3);
if (numargs > 2)
val = luaL_checkint(L, 3);
c->c->setInt32(key, val); c->c->setInt32(key, val);
return 0; return 0;
} }
@@ -2439,10 +2439,13 @@ int CLuaInstance::LuaConfigFileGetBool(lua_State *L)
{ {
CLuaConfigFile *c = LuaConfigFileCheck(L, 1); CLuaConfigFile *c = LuaConfigFileCheck(L, 1);
if (!c) return 0; if (!c) return 0;
int numargs = lua_gettop(L);
bool ret; bool ret;
const char *key = luaL_checkstring(L, 2); const char *key = luaL_checkstring(L, 2);
bool defaultVal = _luaL_checkbool(L, 3); bool defaultVal = false;
if (numargs > 2)
defaultVal = _luaL_checkbool(L, 3);
ret = c->c->getBool(key, defaultVal); ret = c->c->getBool(key, defaultVal);
lua_pushboolean(L, ret); lua_pushboolean(L, ret);
return 1; return 1;
@@ -2452,12 +2455,9 @@ int CLuaInstance::LuaConfigFileSetBool(lua_State *L)
{ {
CLuaConfigFile *c = LuaConfigFileCheck(L, 1); CLuaConfigFile *c = LuaConfigFileCheck(L, 1);
if (!c) return 0; if (!c) return 0;
int numargs = lua_gettop(L);
const char *key = luaL_checkstring(L, 2); const char *key = luaL_checkstring(L, 2);
bool val = false; bool val = _luaL_checkbool(L, 3);
if (numargs > 2)
val = _luaL_checkbool(L, 3);
c->c->setBool(key, val); c->c->setBool(key, val);
return 0; return 0;
} }