summaryrefslogtreecommitdiff
path: root/src/libstddjb/netstring_decode.c
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2017-01-25 15:52:18 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2017-01-25 15:52:18 +0000
commit00c9cb1b22cc17c4db573e0e613a5f116ff0092e (patch)
tree53178b2c52c6e97c6193f73378f3c5e5a781a914 /src/libstddjb/netstring_decode.c
parent2746b131aa482ac17c94bc6b82e58dbcc1b752cf (diff)
downloadskalibs-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/netstring_decode.c')
-rw-r--r--src/libstddjb/netstring_decode.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libstddjb/netstring_decode.c b/src/libstddjb/netstring_decode.c
index a81756b..d129ea8 100644
--- a/src/libstddjb/netstring_decode.c
+++ b/src/libstddjb/netstring_decode.c
@@ -1,17 +1,17 @@
/* ISC license. */
+#include <sys/types.h>
#include <errno.h>
-#include <skalibs/fmtscan.h>
+#include <skalibs/uint64.h>
#include <skalibs/netstring.h>
#include <skalibs/stralloc.h>
-#include <skalibs/uint.h>
-int netstring_decode (stralloc *sa, char const *s, unsigned int len)
+ssize_t netstring_decode (stralloc *sa, char const *s, size_t len)
{
- unsigned int nlen ;
- register unsigned int pos ;
+ uint64_t nlen ;
+ register size_t pos ;
if (!len) return 0 ;
- pos = uint_scan(s, &nlen) ;
+ pos = uint64_scan(s, &nlen) ;
if (pos >= len) return (errno = EINVAL, -1) ;
if (s[pos] != ':') return (errno = EINVAL, -1) ;
s += pos+1 ; len -= pos+1 ;