summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/base64.c14
-rw-r--r--lib/mprintf.c2
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/base64.c b/lib/base64.c
index 042caef71..26d89231e 100644
--- a/lib/base64.c
+++ b/lib/base64.c
@@ -80,12 +80,12 @@ static void decodeQuantum(unsigned char *dest, const char *src)
*/
size_t Curl_base64_decode(const char *src, unsigned char **outptr)
{
- int length = 0;
- int equalsTerm = 0;
- int i;
- int numQuantums;
+ size_t length = 0;
+ size_t equalsTerm = 0;
+ size_t i;
+ size_t numQuantums;
unsigned char lastQuantum[3];
- size_t rawlen=0;
+ size_t rawlen = 0;
unsigned char *newstr;
*outptr = NULL;
@@ -101,7 +101,7 @@ size_t Curl_base64_decode(const char *src, unsigned char **outptr)
numQuantums = (length + equalsTerm) / 4;
/* Don't allocate a buffer if the decoded length is 0 */
- if(numQuantums <= 0)
+ if(numQuantums == 0)
return 0;
rawlen = (numQuantums * 3) - equalsTerm;
@@ -128,7 +128,7 @@ size_t Curl_base64_decode(const char *src, unsigned char **outptr)
for(i = 0; i < 3 - equalsTerm; i++)
newstr[i] = lastQuantum[i];
- newstr[i] = 0; /* zero terminate */
+ newstr[i] = '\0'; /* zero terminate */
return rawlen;
}
diff --git a/lib/mprintf.c b/lib/mprintf.c
index b0f1a9267..3d65e9ff7 100644
--- a/lib/mprintf.c
+++ b/lib/mprintf.c
@@ -871,7 +871,7 @@ static int dprintf_formatf(
len = strlen(str);
if(prec != -1 && (size_t) prec < len)
- len = prec;
+ len = (size_t)prec;
width -= (long)len;
if(p->flags & FLAGS_ALT)