diff options
author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-02-17 22:30:53 +0000 |
---|---|---|
committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-02-17 22:30:53 +0000 |
commit | fdffefb8032922ce7ffe4c00816072a8ff2148fc (patch) | |
tree | bc7313151a429c45d8bab8ad8b9dd32f4e51335f /src/libstddjb/string_unquote.c | |
parent | a896ca2a8c617e5e00ffd5fc9e69331ad754e5b3 (diff) | |
download | skalibs-fdffefb8032922ce7ffe4c00816072a8ff2148fc.tar.xz |
More types changes
New disize
Add size_t to the autotypes list
Delete redundant and replace-libc files
dev_t/ino_t pass
Big size_t pass
More things missing, still not operational yet
Diffstat (limited to 'src/libstddjb/string_unquote.c')
-rw-r--r-- | src/libstddjb/string_unquote.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/libstddjb/string_unquote.c b/src/libstddjb/string_unquote.c index f4482ff..4245014 100644 --- a/src/libstddjb/string_unquote.c +++ b/src/libstddjb/string_unquote.c @@ -1,18 +1,19 @@ /* ISC license. */ +#include <sys/types.h> +#include <string.h> #include <errno.h> -#include <skalibs/bytestr.h> #include <skalibs/skamisc.h> -int string_unquote (char *d, unsigned int *w, char const *s, unsigned int len, unsigned int *r) +int string_unquote (char *d, size_t *w, char const *s, size_t len, size_t *r) { if (!len-- || (*s++ != '"')) return (errno = EINVAL, 0) ; { - unsigned int rr, ww ; - char tmp[len] ; + size_t rr, ww ; + char tmp[len ? len : 1] ; if (!string_unquote_withdelim(tmp, &ww, s, len, &rr, "\"", 1)) return 0 ; if (rr == len) return (errno = EPIPE, 0) ; - byte_copy(d, ww, tmp) ; + memcpy(d, tmp, ww) ; *w = ww ; *r = rr + 2 ; } |