aboutsummaryrefslogtreecommitdiffstats
path: root/src/libstddjb/ip4_scanlist_u32.c
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2017-02-21 12:05:07 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2017-02-21 12:05:07 +0000
commit49d8fa1058aaf23c29e074b2314492ae40d2f557 (patch)
tree393f884d5a99f984e992a0f35f1b02ac43536217 /src/libstddjb/ip4_scanlist_u32.c
parentfdffefb8032922ce7ffe4c00816072a8ff2148fc (diff)
downloadskalibs-49d8fa1058aaf23c29e074b2314492ae40d2f557.tar.gz
Types change: big pass on libstddjb and libunixonacid
libdatastruct still missing, library still not functional
Diffstat (limited to 'src/libstddjb/ip4_scanlist_u32.c')
-rw-r--r--src/libstddjb/ip4_scanlist_u32.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/libstddjb/ip4_scanlist_u32.c b/src/libstddjb/ip4_scanlist_u32.c
index 10c24cf..5515bca 100644
--- a/src/libstddjb/ip4_scanlist_u32.c
+++ b/src/libstddjb/ip4_scanlist_u32.c
@@ -1,9 +1,7 @@
/* ISC license. */
-#include <sys/types.h>
#include <stdint.h>
-#include <skalibs/uint32.h>
-#include <skalibs/bytestr.h>
+#include <string.h>
#include <skalibs/fmtscan.h>
size_t ip4_scanlist_u32 (uint32_t *out, size_t max, char const *s, size_t *num)
@@ -11,10 +9,10 @@ size_t ip4_scanlist_u32 (uint32_t *out, size_t max, char const *s, size_t *num)
size_t n = 0, w = 0 ;
for (; s[w] && (n < max) ; n++)
{
- register size_t i = ip4_scanu32(s + w, out + n) ;
+ size_t i = ip4_scanu32(s + w, out + n) ;
if (!i) break ;
w += i ;
- while (byte_chr(",:; \t\r\n", 7, s[w]) < 7) w++ ;
+ while (memchr(",:; \t\r\n", s[w], 7)) w++ ;
}
*num = n ;
return w ;