From 3d1bc05f5ed192b5ec6a116454e5fd9455db1dd4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 27 Jan 2017 19:28:16 +0100 Subject: [PATCH] lua: get rid of knot_rrset_txt_dump I believe it was unused, so no risk was caused, but better remove it. There's the complication that its signature has changed since libknot-2.4.0. Fixes https://gitlab.labs.nic.cz/knot/resolver/issues/146 --- daemon/lua/kres-gen.lua | 1 - daemon/lua/kres-gen.sh | 1 - daemon/lua/kres.lua | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/daemon/lua/kres-gen.lua b/daemon/lua/kres-gen.lua index 37ce82144..666ef825e 100644 --- a/daemon/lua/kres-gen.lua +++ b/daemon/lua/kres-gen.lua @@ -161,7 +161,6 @@ uint8_t *knot_rdata_data(const knot_rdata_t *); knot_rdata_t *knot_rdataset_at(const knot_rdataset_t *, size_t); uint32_t knot_rrset_ttl(const knot_rrset_t *); int knot_rrset_txt_dump_data(const knot_rrset_t *, const size_t, char *, const size_t, const knot_dump_style_t *); -int knot_rrset_txt_dump(const knot_rrset_t *, char *, const size_t, const knot_dump_style_t *); const knot_dname_t *knot_pkt_qname(const knot_pkt_t *); uint16_t knot_pkt_qtype(const knot_pkt_t *); uint16_t knot_pkt_qclass(const knot_pkt_t *); diff --git a/daemon/lua/kres-gen.sh b/daemon/lua/kres-gen.sh index 34e4424ca..8cbe3e25c 100755 --- a/daemon/lua/kres-gen.sh +++ b/daemon/lua/kres-gen.sh @@ -76,7 +76,6 @@ genResType "enum kr_query_flag" | sed -e 's/enum kr_query_flag/struct query_flag knot_rdataset_at knot_rrset_ttl knot_rrset_txt_dump_data - knot_rrset_txt_dump # Packet knot_pkt_qname knot_pkt_qtype diff --git a/daemon/lua/kres.lua b/daemon/lua/kres.lua index a24a73a46..8e78e45a0 100644 --- a/daemon/lua/kres.lua +++ b/daemon/lua/kres.lua @@ -153,7 +153,7 @@ ffi.metatype( knot_rrset_t, { if i ~= nil then ret = knot.knot_rrset_txt_dump_data(rr, i, rrset_buf, rrset_buflen, knot.KNOT_DUMP_STYLE_DEFAULT) else - ret = knot.knot_rrset_txt_dump(rr, rrset_buf, rrset_buflen, knot.KNOT_DUMP_STYLE_DEFAULT) + ret = -1 end return ret >= 0 and ffi.string(rrset_buf) end -- 2.47.2