bugfix: avltree_delete needs to pass UINT32_MAX as sentinel

Signed-off-by: Laurent Bercot <ska@appnovation.com>

4 files changed, 9 insertions, 13 deletions

diff --git a/package/deps.mak b/package/deps.mak
index 5755c55..f6481ae 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -30,7 +30,6 @@ src/include/skalibs/genset.h: src/include/skalibs/functypes.h
 src/include/skalibs/gensetdyn.h: src/include/skalibs/functypes.h src/include/skalibs/genalloc.h src/include/skalibs/stralloc.h
 src/include/skalibs/gol.h: src/include/skalibs/uint64.h
 src/include/skalibs/iopause.h: src/include/skalibs/tai.h
-src/include/skalibs/ip46.h: src/include/skalibs/fmtscan.h src/include/skalibs/socket.h src/include/skalibs/tai.h
 src/include/skalibs/kolbak.h: src/include/skalibs/unixmessage.h
 src/include/skalibs/lolstdio.h: src/include/skalibs/bufalloc.h src/include/skalibs/buffer.h src/include/skalibs/strerr.h
 src/include/skalibs/netstring.h: src/include/skalibs/buffer.h src/include/skalibs/stralloc.h
@@ -54,9 +53,6 @@ src/include/skalibs/strerr2.h: src/include/skalibs/strerr.h
 src/include/skalibs/tai.h: src/include/skalibs/gccattributes.h src/include/skalibs/uint64.h
 src/include/skalibs/textclient.h: src/include/skalibs/allreadwrite.h src/include/skalibs/tai.h src/include/skalibs/textmessage.h
 src/include/skalibs/textmessage.h: src/include/skalibs/allreadwrite.h src/include/skalibs/bufalloc.h src/include/skalibs/buffer.h src/include/skalibs/gccattributes.h src/include/skalibs/stralloc.h src/include/skalibs/tai.h
-src/include/skalibs/types.h: src/include/skalibs/uint16.h src/include/skalibs/uint32.h src/include/skalibs/uint64.h
-src/include/skalibs/uint16.h: src/include/skalibs/uint64.h
-src/include/skalibs/uint32.h: src/include/skalibs/uint64.h
 src/include/skalibs/unix-timed.h: src/include/skalibs/bufalloc.h src/include/skalibs/buffer.h src/include/skalibs/functypes.h src/include/skalibs/stralloc.h src/include/skalibs/tai.h
 src/include/skalibs/unix-transactional.h: src/include/skalibs/direntry.h src/include/skalibs/stralloc.h
 src/include/skalibs/unixconnection.h: src/include/skalibs/unixmessage.h
diff --git a/src/libdatastruct/avlnode_insertnode.c b/src/libdatastruct/avlnode_insertnode.c
index 294b109..5bb22d2 100644
--- a/src/libdatastruct/avlnode_insertnode.c
+++ b/src/libdatastruct/avlnode_insertnode.c
@@ -10,7 +10,6 @@ uint32_t avlnode_insertnode (avlnode *s, uint32_t max, uint32_t r, uint32_t i, d
   uint32_t stack[AVLNODE_MAXDEPTH] ;
   uint8_t spin[AVLNODE_MAXDEPTH] ;
   uint8_t sp = 0 ;
-  
   {
     void const *k = (*dtok)(s[i].data, p) ;
     for (; r < max ; sp++)
@@ -31,13 +30,12 @@ uint32_t avlnode_insertnode (avlnode *s, uint32_t max, uint32_t r, uint32_t i, d
   return r ;
 
  lastfix:
-  if (avlnode_ufroms(s[r].balance) != spin[sp])
+  if (avlnode_ufroms(s[r].balance) != spin[sp]) s[r].balance = 0 ;
+  else
   {
-    s[r].balance = 0 ;
-    return stack[0] ;
+    r = avlnode_rotate_maydouble(s, max, r, !spin[sp], spin[sp] != spin[sp+1]) ;
+    if (!sp--) return r ;
+    s[stack[sp]].child[spin[sp]] = r ;
   }
-  r = avlnode_rotate_maydouble(s, max, r, !spin[sp], spin[sp] != spin[sp+1]) ;
-  if (!sp--) return r ;
-  s[stack[sp]].child[spin[sp]] = r ;
   return stack[0] ;
 }
diff --git a/src/libdatastruct/avltree_delete.c b/src/libdatastruct/avltree_delete.c
index 04f6097..b0b63fc 100644
--- a/src/libdatastruct/avltree_delete.c
+++ b/src/libdatastruct/avltree_delete.c
@@ -2,6 +2,7 @@
 
 #include <stdint.h>
 #include <errno.h>
+
 #include <skalibs/gensetdyn.h>
 #include <skalibs/avlnode.h>
 #include <skalibs/avltree.h>
@@ -9,8 +10,8 @@
 int avltree_delete (avltree *t, void const *k)
 {
   uint32_t r = avltree_root(t) ;
-  uint32_t i = avlnode_delete(avltree_nodes(t), avltree_totalsize(t), &r, k, t->dtok, t->kcmp, t->external) ;
-  if (i >= avltree_totalsize(t)) return (errno = ESRCH, 0) ;
+  uint32_t i = avlnode_delete(avltree_nodes(t), UINT32_MAX, &r, k, t->dtok, t->kcmp, t->external) ;
+  if (i >= UINT32_MAX) return (errno = ESRCH, 0) ;
   avltree_setroot(t, r) ;
   if (!gensetdyn_delete(&t->x, i)) return 0 ;
   return 1 ;
diff --git a/src/libdatastruct/avltree_newnode.c b/src/libdatastruct/avltree_newnode.c
index 3d658c6..300f918 100644
--- a/src/libdatastruct/avltree_newnode.c
+++ b/src/libdatastruct/avltree_newnode.c
@@ -1,6 +1,7 @@
 /* ISC license. */
 
 #include <errno.h>
+
 #include <skalibs/gensetdyn.h>
 #include <skalibs/avlnode.h>
 #include <skalibs/avltree.h>