diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-01-25 15:52:18 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-01-25 15:52:18 +0000 |
| commit | 00c9cb1b22cc17c4db573e0e613a5f116ff0092e (patch) | |
| tree | 53178b2c52c6e97c6193f73378f3c5e5a781a914 /src/libstddjb/ip6_fmt.c | |
| parent | 2746b131aa482ac17c94bc6b82e58dbcc1b752cf (diff) | |
| download | skalibs-00c9cb1b22cc17c4db573e0e613a5f116ff0092e.tar.xz | |
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.
Diffstat (limited to 'src/libstddjb/ip6_fmt.c')
| -rw-r--r-- | src/libstddjb/ip6_fmt.c | 9 |
1 files changed, 5 insertions, 4 deletions
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 <sys/types.h> #include <skalibs/diuint.h> #include <skalibs/fmtscan.h> #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) ; |