Add slurpn, refactor slurp, fix avltree/cdbmake bugs, add strerr_warnf

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

1 files changed, 1 insertions, 25 deletions

diff --git a/src/libstddjb/slurp.c b/src/libstddjb/slurp.c
index 7437142..eccd833 100644
--- a/src/libstddjb/slurp.c
+++ b/src/libstddjb/slurp.c
@@ -1,32 +1,8 @@
 /* ISC license. */
 
-#include <sys/types.h>
-
-#include <skalibs/allreadwrite.h>
-#include <skalibs/stralloc.h>
 #include <skalibs/djbunix.h>
 
-#define N 4096
-
 int slurp (stralloc *sa, int fd)
 {
-  size_t sabase = sa->len ;
-  int wasnull = !sa->s ;
-  for (;;)
-  {
-    ssize_t r ;
-    if (!stralloc_readyplus(sa, N)) break ;
-    r = fd_read(fd, sa->s + sa->len, N) ;
-    switch (r)
-    {
-      case -1 : goto err ;
-      case 0 : return 1 ;
-      default : sa->len += r ;
-    }
-  }
-
-err:
-  if (wasnull) stralloc_free(sa) ;
-  else sa->len = sabase ;
-  return 0 ;
+  return slurpn(fd, sa, 0) ;
 }