The base64 encode function now takes a size_t for size, not an int as

previously.

diff --git a/lib/base64.c b/lib/base64.c
index a1f5d893461d8bc272888077121d67d817637f6e..fb8e91d923afeab87b87442a365aba7abaf4cb90 100644 (file)
--- a/lib/base64.c
+++ b/lib/base64.c
@@ -115,7 +115,7 @@ static char table64[]=
  * went wrong, -1 is returned.
  *
  */
-int Curl_base64_encode(const void *inp, int insize, char **outptr)
+int Curl_base64_encode(const void *inp, size_t insize, char **outptr)
 {
   unsigned char ibuf[3];
   unsigned char obuf[4];
@@ -202,7 +202,7 @@ void *suck(int *);
 int main(int argc, char **argv, char **envp)
 {
   char *base64;
-  int base64Len;
+  size_t base64Len;
   unsigned char *data;
   int dataLen;
        

diff --git a/lib/base64.h b/lib/base64.h
index c4d321e172a0f242583ab984e19b1367c8d83896..767637e3de38654bd2b5c8bb48add266d5a327da 100644 (file)
--- a/lib/base64.h
+++ b/lib/base64.h
@@ -22,6 +22,6 @@
  *
  * $Id$
  ***************************************************************************/
-int Curl_base64_encode(const void *data, int size, char **str);
+int Curl_base64_encode(const void *data, size_t size, char **str);
 int Curl_base64_decode(const char *str, void *data);
 #endif

diff --git a/lib/http_ntlm.c b/lib/http_ntlm.c
index 5a6fba790fbe49e37b9cd54cfac707b340e2ff7b..44fe01397795e651b31b60deb146bda559323ae1 100644 (file)
--- a/lib/http_ntlm.c
+++ b/lib/http_ntlm.c
@@ -286,7 +286,7 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
   int hostlen = strlen(host);
   int hostoff; /* host name offset */
   int domoff;  /* domain name offset */
-  int size;
+  size_t size;
   char *base64=NULL;
   unsigned char ntlmbuf[256]; /* enough, unless the host/domain is very long */