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/headers/ip46-header | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/headers/ip46-header') diff --git a/src/headers/ip46-header b/src/headers/ip46-header index ba310d3..91d0c86 100644 --- a/src/headers/ip46-header +++ b/src/headers/ip46-header @@ -3,8 +3,9 @@ #ifndef IP46_H #define IP46_H +#include +#include #include -#include #include #include #include @@ -27,8 +28,8 @@ struct ip46full_s #define ip46full_is6(i) ((i)->is6) #define ip46full_fmt(s, i) ((i)->is6 ? ip6_fmt(s, (i)->ip) : ip4_fmt(s, (i)->ip)) -extern unsigned int ip46full_scan (char const *, ip46full_t *) ; -extern unsigned int ip46full_scanlist (ip46full_t *, unsigned int, char const *, unsigned int *) ; +extern size_t ip46full_scan (char const *, ip46full_t *) ; +extern size_t ip46full_scanlist (ip46full_t *, size_t, char const *, size_t *) ; #define ip46full_from_ip4(i, ip4) (byte_copy((i)->ip, 4, ip4), byte_zero((i)->ip + 4, 12), (i)->is6 = 0) #define ip46full_from_ip6(i, ip6) (byte_copy((i)->ip, 16, ip6), (i)->is6 = 1) -- cgit v1.3.1