Types change: big pass on libstddjb and libunixonacid

 libdatastruct still missing, library still not functional

1 files changed, 4 insertions, 5 deletions

diff --git a/src/libstddjb/ip46_scanlist.c b/src/libstddjb/ip46_scanlist.c
index 7ee2b68..d6d5cbc 100644
--- a/src/libstddjb/ip46_scanlist.c
+++ b/src/libstddjb/ip46_scanlist.c
@@ -1,9 +1,8 @@
 /* ISC license. */
 
-#include <sys/types.h>
-#include <skalibs/ip46.h>
-#include <skalibs/bytestr.h>
+#include <string.h>
 #include <skalibs/fmtscan.h>
+#include <skalibs/ip46.h>
 
 size_t ip46full_scanlist (ip46full_t *out, size_t max, char const *s, size_t *num)
 {
@@ -11,7 +10,7 @@ size_t ip46full_scanlist (ip46full_t *out, size_t max, char const *s, size_t *nu
   for (; s[w] && (n < max) ; n++)
   {
     ip46full_t z ;
-    register size_t i = ip6_scan(s + w, z.ip) ;
+    size_t i = ip6_scan(s + w, z.ip) ;
     if (i) z.is6 = 1 ;
     else
     {
@@ -21,7 +20,7 @@ size_t ip46full_scanlist (ip46full_t *out, size_t max, char const *s, size_t *nu
     }
     out[n] = z ;
     w += i ;
-    while (byte_chr(",; \t\r\n", 6, s[w]) < 6) w++ ;
+    while (memchr(",; \t\r\n", s[w], 6)) w++ ;
   }
   *num = n ;
   return w ;