From d0aab7b1fc7c94c3d6d41990e7615be85b58e640 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 2 Jan 2013 14:35:35 +0100 Subject: [PATCH] change uh_b64decode to take a void pointer to avoid redundant signed/unsigned casts --- utils.c | 7 ++++--- utils.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/utils.c b/utils.c index e3de061..d2ad296 100644 --- a/utils.c +++ b/utils.c @@ -147,16 +147,17 @@ int uh_urlencode(char *buf, int blen, const char *src, int slen) return (i == slen) ? len : -1; } -int uh_b64decode(char *buf, int blen, const unsigned char *src, int slen) +int uh_b64decode(char *buf, int blen, const void *src, int slen) { + const unsigned char *str = src; unsigned int cout = 0; unsigned int cin = 0; int len = 0; int i = 0; - for (i = 0; (i <= slen) && (src[i] != 0); i++) + for (i = 0; (i <= slen) && (str[i] != 0); i++) { - cin = src[i]; + cin = str[i]; if ((cin >= '0') && (cin <= '9')) cin = cin - '0' + 52; diff --git a/utils.h b/utils.h index 0853943..8f67823 100644 --- a/utils.h +++ b/utils.h @@ -54,7 +54,7 @@ static inline void clearenv(void) int uh_urldecode(char *buf, int blen, const char *src, int slen); int uh_urlencode(char *buf, int blen, const char *src, int slen); -int uh_b64decode(char *buf, int blen, const unsigned char *src, int slen); +int uh_b64decode(char *buf, int blen, const void *src, int slen); bool uh_path_match(const char *prefix, const char *url); char *uh_split_header(char *str); -- 2.30.2