X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fbase64%2Fbase64.c;h=b2326293a992b45d011999a5211b4fc9fa54634e;hb=03fb6fe61efbef24edbe879e94b6c0c6d9221a6e;hp=5e75dd71c5c9629f452c13504591425643fe522d;hpb=78158c87e37ce3b41cd5145e29baea38fd002374;p=ccan

diff --git a/ccan/base64/base64.c b/ccan/base64/base64.c
index 5e75dd71..b2326293 100644
--- a/ccan/base64/base64.c
+++ b/ccan/base64/base64.c
@@ -14,7 +14,6 @@
  */
 static char sixbit_to_b64(const base64_maps_t *maps, const uint8_t sixbit)
 {
-	assert(sixbit >= 0);
 	assert(sixbit <= 63);
 
 	return maps->encode_map[(unsigned char)sixbit];
@@ -119,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;
@@ -144,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];
@@ -179,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;
@@ -210,7 +209,7 @@ ssize_t base64_decode_using_maps(const base64_maps_t *maps,
 /**
  * base64_maps_rfc4648 - pregenerated maps struct for rfc4648
  */
-static const base64_maps_t base64_maps_rfc4648 = {
+const base64_maps_t base64_maps_rfc4648 = {
   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",
 
   "\xff\xff\xff\xff\xff" /* 0 */					\