From 03fb6fe61efbef24edbe879e94b6c0c6d9221a6e Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Thu, 11 May 2017 18:28:24 +0200 Subject: [PATCH] base64: fix assignment to wrong type, use ssize_t Functions that returned int have been modified to return ssize_t instead. Found by gcc: base64.c:196:11: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] if (more == -1) { ^ Signed-off-by: Martin Milata --- ccan/base64/base64.c | 6 +++--- ccan/base64/base64.h | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ccan/base64/base64.c b/ccan/base64/base64.c index a216f478..b2326293 100644 --- a/ccan/base64/base64.c +++ b/ccan/base64/base64.c @@ -118,7 +118,7 @@ size_t base64_decoded_length(size_t srclen) return ((srclen+3)/4*3); } -int base64_decode_quartet_using_maps(const base64_maps_t *maps, char dest[3], +ssize_t base64_decode_quartet_using_maps(const base64_maps_t *maps, char dest[3], const char src[4]) { signed char a; @@ -143,7 +143,7 @@ int base64_decode_quartet_using_maps(const base64_maps_t *maps, char dest[3], } -int base64_decode_tail_using_maps(const base64_maps_t *maps, char dest[3], +ssize_t base64_decode_tail_using_maps(const base64_maps_t *maps, char dest[3], const char * src, const size_t srclen) { char longsrc[4]; @@ -178,7 +178,7 @@ ssize_t base64_decode_using_maps(const base64_maps_t *maps, { ssize_t dest_offset = 0; ssize_t i; - size_t more; + ssize_t more; if (destlen < base64_decoded_length(srclen)) { errno = EOVERFLOW; diff --git a/ccan/base64/base64.h b/ccan/base64/base64.h index 405dc63f..cef30d25 100644 --- a/ccan/base64/base64.h +++ b/ccan/base64/base64.h @@ -103,8 +103,8 @@ ssize_t base64_decode_using_maps(const base64_maps_t *maps, * @return Number of decoded bytes set in dest. -1 on error (and errno set) * @note sets errno = EDOM if src contains invalid characters */ -int base64_decode_quartet_using_maps(const base64_maps_t *maps, - char dest[3], const char src[4]); +ssize_t base64_decode_quartet_using_maps(const base64_maps_t *maps, + char dest[3], const char src[4]); /** * base64_decode_tail_using_maps - decode the final bytes of a base64 string using a specific alphabet @@ -116,8 +116,8 @@ int base64_decode_quartet_using_maps(const base64_maps_t *maps, * @note sets errno = EDOM if src contains invalid characters * @note sets errno = EINVAL if src is an invalid base64 tail */ -int base64_decode_tail_using_maps(const base64_maps_t *maps, char *dest, - const char *src, size_t srclen); +ssize_t base64_decode_tail_using_maps(const base64_maps_t *maps, char *dest, + const char *src, size_t srclen); /* the rfc4648 functions: */ @@ -212,7 +212,7 @@ ssize_t base64_decode(char *dest, size_t destlen, * @note sets errno = EDOM if src contains invalid characters */ static inline -int base64_decode_quartet(char dest[3], const char src[4]) +ssize_t base64_decode_quartet(char dest[3], const char src[4]) { return base64_decode_quartet_using_maps(&base64_maps_rfc4648, dest, src); -- 2.39.2