fixup! lib/generic/trie: sync the new version from knot-dns

diff --git a/lib/generic/trie.c b/lib/generic/trie.c
index d59aeaa4dc347bce36917e7eb8d01bc8cfa63142..efbb659a767521cf741366d32ac549df7f0f52cb 100644 (file)
--- 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 d941d3c0d5bc4cabca3a5f9ca8983156bd2fe31c..cad4faa3cea5e1e7b4a6347dd6a9ec2cc4ee853f 100644 (file)
--- 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.
  */