From e1e78e169e2df25c5fa354fa3e77b0f6ce2d09d6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Vavru=C5=A1a?= Date: Mon, 15 Jun 2015 10:25:05 +0200 Subject: [PATCH] daemon/bindings: cleanup --- daemon/bindings.c | 11 ----------- daemon/bindings.h | 11 +++++++++++ daemon/daemon.mk | 1 + lib/layer/iterate.c | 1 + 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/daemon/bindings.c b/daemon/bindings.c index 9bf833890..66ac0454a 100644 --- a/daemon/bindings.c +++ b/daemon/bindings.c @@ -42,17 +42,6 @@ static int format_error(lua_State* L, const char *err) return 1; } -/** @internal Compatibility wrapper for Lua 5.0 - 5.2 */ -#if LUA_VERSION_NUM >= 502 -#define register_lib(L, name, lib) \ - luaL_newlib((L), (lib)) -#else -#define lua_rawlen(L, obj) \ - lua_objlen((L), (obj)) -#define register_lib(L, name, lib) \ - luaL_openlib((L), (name), (lib), 0) -#endif - /** List loaded modules */ static int mod_list(lua_State *L) { diff --git a/daemon/bindings.h b/daemon/bindings.h index b6e0b1d1d..f350088f5 100644 --- a/daemon/bindings.h +++ b/daemon/bindings.h @@ -25,6 +25,17 @@ #include "daemon/engine.h" + /** @internal Compatibility wrapper for Lua 5.0 - 5.2 */ + #if LUA_VERSION_NUM >= 502 + #define register_lib(L, name, lib) \ + luaL_newlib((L), (lib)) + #else + #define lua_rawlen(L, obj) \ + lua_objlen((L), (obj)) + #define register_lib(L, name, lib) \ + luaL_openlib((L), (name), (lib), 0) + #endif + /** * Load 'modules' package. * @param L scriptable diff --git a/daemon/daemon.mk b/daemon/daemon.mk index 829fa69be..958308cc6 100644 --- a/daemon/daemon.mk +++ b/daemon/daemon.mk @@ -8,6 +8,7 @@ kresd_SOURCES := \ daemon/worker.c \ daemon/bindings.c \ daemon/ffimodule.c \ + daemon/bindings/kres.c \ daemon/main.c # Embed resources diff --git a/lib/layer/iterate.c b/lib/layer/iterate.c index 814893d16..2c0ff2f16 100644 --- a/lib/layer/iterate.c +++ b/lib/layer/iterate.c @@ -370,6 +370,7 @@ int kr_make_query(struct kr_query *query, knot_pkt_t *pkt) /* Query built, expect answer. */ query->id = isaac_next_uint(&ISAAC, UINT16_MAX); knot_wire_set_id(pkt->wire, query->id); + pkt->parsed = pkt->size; return kr_ok(); } -- 2.47.2