From ad87980f6d4f0321aab0ed873c69ceaa31451b29 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 4 Feb 2019 14:59:58 +0100 Subject: [PATCH] fixup! lib/generic/trie: sync the new version from knot-dns --- lib/generic/trie.c | 2 +- lib/generic/trie.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/generic/trie.c b/lib/generic/trie.c index d59aeaa4d..efbb659a7 100644 --- a/lib/generic/trie.c +++ b/lib/generic/trie.c @@ -538,7 +538,7 @@ static void ns_init(nstack_t *ns, trie_t *tbl) static inline trie_t * ns_gettrie(nstack_t *ns) { assert(ns && ns->stack && ns->stack[0]); - return (struct trie *)&ns->stack[0]; + return (struct trie *)ns->stack[0]; } /*! \brief Free inside of the stack, i.e. not the passed pointer itself. */ diff --git a/lib/generic/trie.h b/lib/generic/trie.h index d941d3c0d..cad4faa3c 100644 --- a/lib/generic/trie.h +++ b/lib/generic/trie.h @@ -32,7 +32,7 @@ * - key lengths are limited by 2^32-1 ATM * * XXX EDITORS: trie.{h,c} are synced from - * https://gitlab.labs.nic.cz/knot/knot-dns src/contrib/qp-trie tree 5a07850389039 + * https://gitlab.labs.nic.cz/knot/knot-dns src/contrib/qp-trie tree 0193b76f03 * only with tiny adjustments, mostly #includes and KR_EXPORT. */ -- 2.47.2