diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-02-16 09:59:52 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-02-16 09:59:52 +0000 |
| commit | 6bc5286496c43a0ee9f1a616507c7aa03e28450c (patch) | |
| tree | 9a6ed4374aaf129777560ba58f608368fb8754df /src/lua | |
| parent | 153e64677902c1acc7a1e8ee21d5b634d8a65885 (diff) | |
| download | rspamd-6bc5286496c43a0ee9f1a616507c7aa03e28450c.tar.gz rspamd-6bc5286496c43a0ee9f1a616507c7aa03e28450c.zip | |
Refactor UCL API
Diffstat (limited to 'src/lua')
| -rw-r--r-- | src/lua/lua_classifier.c | 2 | ||||
| -rw-r--r-- | src/lua/lua_common.c | 4 | ||||
| -rw-r--r-- | src/lua/lua_config.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/lua/lua_classifier.c b/src/lua/lua_classifier.c index d8add5e4d..f777ba8aa 100644 --- a/src/lua/lua_classifier.c +++ b/src/lua/lua_classifier.c @@ -364,7 +364,7 @@ lua_statfile_get_param (lua_State *L) param = luaL_checkstring (L, 2); if (st != NULL && param != NULL) { - value = ucl_object_find_key (st->opts, param); + value = ucl_object_lookup (st->opts, param); if (value != NULL) { lua_pushstring (L, ucl_object_tostring_forced (value)); return 1; diff --git a/src/lua/lua_common.c b/src/lua/lua_common.c index eb3b7de3f..960d3457d 100644 --- a/src/lua/lua_common.c +++ b/src/lua/lua_common.c @@ -173,9 +173,9 @@ rspamd_lua_set_path (lua_State *L, struct rspamd_config *cfg) return; } - opts = ucl_object_find_key (cfg->rcl_obj, "options"); + opts = ucl_object_lookup (cfg->rcl_obj, "options"); if (opts != NULL) { - opts = ucl_object_find_key (opts, "lua_path"); + opts = ucl_object_lookup (opts, "lua_path"); if (opts != NULL && ucl_object_type (opts) == UCL_STRING) { additional_path = ucl_object_tostring (opts); } diff --git a/src/lua/lua_config.c b/src/lua/lua_config.c index 9cf18fa22..4421bf179 100644 --- a/src/lua/lua_config.c +++ b/src/lua/lua_config.c @@ -900,7 +900,7 @@ lua_config_get_key (lua_State *L) name = luaL_checklstring(L, 2, &namelen); if (name && cfg) { - val = ucl_object_find_keyl(cfg->rcl_obj, name, namelen); + val = ucl_object_lookup_len(cfg->rcl_obj, name, namelen); if (val != NULL) { ucl_object_push_lua (L, val, val->type != UCL_ARRAY); } |