Skip to content
Snippets Groups Projects
Commit f1d7ba45 authored by Konstantin Osipov's avatar Konstantin Osipov
Browse files

configuration: review fixes for array-like configuration options

parent 631769c3
No related branches found
No related tags found
No related merge requests found
...@@ -52,8 +52,9 @@ cfg_geti(const char *param) ...@@ -52,8 +52,9 @@ cfg_geti(const char *param)
return val; return val;
} }
/* Support simultaneous cfg_gets("str1") and cfg_gets("str2") */
static const char * static const char *
cfg_converts(struct lua_State *L) cfg_tostring(struct lua_State *L)
{ {
static char __thread values[MAX_STR_OPTS][MAX_OPT_VAL_LEN]; static char __thread values[MAX_STR_OPTS][MAX_OPT_VAL_LEN];
static int __thread i = 0; static int __thread i = 0;
...@@ -69,9 +70,8 @@ cfg_converts(struct lua_State *L) ...@@ -69,9 +70,8 @@ cfg_converts(struct lua_State *L)
const char * const char *
cfg_gets(const char *param) cfg_gets(const char *param)
{ {
/* Support simultaneous cfg_gets("str1") and cfg_gets("str2") */
cfg_get(param); cfg_get(param);
const char *val = cfg_converts(tarantool_L); const char *val = cfg_tostring(tarantool_L);
lua_pop(tarantool_L, 1); lua_pop(tarantool_L, 1);
return val; return val;
} }
...@@ -101,7 +101,7 @@ cfg_getarr_elem(const char *name, int i) ...@@ -101,7 +101,7 @@ cfg_getarr_elem(const char *name, int i)
cfg_get(name); cfg_get(name);
luaL_checktype(tarantool_L, -1, LUA_TTABLE); luaL_checktype(tarantool_L, -1, LUA_TTABLE);
lua_rawgeti(tarantool_L, -1, i + 1); lua_rawgeti(tarantool_L, -1, i + 1);
const char *val = cfg_converts(tarantool_L); const char *val = cfg_tostring(tarantool_L);
lua_pop(tarantool_L, 2); lua_pop(tarantool_L, 2);
return val; return val;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment