From 00c9cb1b22cc17c4db573e0e613a5f116ff0092e Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Wed, 25 Jan 2017 15:52:18 +0000 Subject: More work on the types. This commit builds but has errors. Rework src/headers entirely: build skalibs/types.h Convert skalibs/fmtscan.h types. Propagate changes until it builds. There are a lot of incompatible pointer issues remaining, those will be fixed with the buffer overhaul. --- src/libstddjb/ip6_fmt.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/libstddjb/ip6_fmt.c') diff --git a/src/libstddjb/ip6_fmt.c b/src/libstddjb/ip6_fmt.c index afd8a21..eb6acc0 100644 --- a/src/libstddjb/ip6_fmt.c +++ b/src/libstddjb/ip6_fmt.c @@ -1,13 +1,14 @@ /* ISC license. */ +#include #include #include #define px(c) ((j || (c)) ? (*s++ = fmtscan_asc(c), 1) : 0) -static inline unsigned int xfmt16 (char *s, char const *key) +static inline size_t xfmt16 (char *s, char const *key) { - register unsigned int j = 0 ; + register size_t j = 0 ; j += px((unsigned char)key[0] >> 4) ; j += px((unsigned char)key[0] & 15) ; j += px((unsigned char)key[1] >> 4) ; @@ -55,9 +56,9 @@ static inline unsigned int find_colcol (char const *key, unsigned int *pos) return 0 ; } -unsigned int ip6_fmt (char *s, char const *ip6) +size_t ip6_fmt (char *s, char const *ip6) { - unsigned int w = 0 ; + size_t w = 0 ; register unsigned int i = 0 ; unsigned int pos = 8 ; unsigned int len = find_colcol(ip6, &pos) ; -- cgit v1.2.3