diff options
| author | David Robillard <d@drobilla.net> | 2018-12-31 11:48:42 -0500 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2020-06-21 18:12:04 +0200 |
| commit | b8fdca565db6facfcaca2c35ad4fa9c51eeb299d (patch) | |
| tree | ada203abc2b4a0f1276c70258fba1b7f3763f908 /src/base64.c | |
| parent | d68795cb7d79ed4b6b92386f548524ae518f41b9 (diff) | |
| download | serd-b8fdca565db6facfcaca2c35ad4fa9c51eeb299d.tar.gz serd-b8fdca565db6facfcaca2c35ad4fa9c51eeb299d.tar.bz2 serd-b8fdca565db6facfcaca2c35ad4fa9c51eeb299d.zip | |
Fix various warnings and conversion issues
Diffstat (limited to 'src/base64.c')
| -rw-r--r-- | src/base64.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/base64.c b/src/base64.c index 09612a55..97e41e15 100644 --- a/src/base64.c +++ b/src/base64.c @@ -39,7 +39,7 @@ static const uint8_t b64_map[] = for decoding, shifted up by 47 to be in the range of printable ASCII. A '$' is a placeholder for characters not in the base64 alphabet. */ -static const char b64_unmap[] = +static const uint8_t b64_unmap[] = "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$m$$$ncdefghijkl$$$$$$" "$/0123456789:;<=>?@ABCDEFGH$$$$$$IJKLMNOPQRSTUVWXYZ[\\]^_`ab$$$$" "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" @@ -96,7 +96,7 @@ serd_base64_encode(char* const str, static inline uint8_t unmap(const uint8_t in) { - return (uint8_t)(b64_unmap[in] - 47); + return (uint8_t)(b64_unmap[in] - 47u); } /** Decode 4 base64 characters to 3 raw bytes. */ @@ -106,7 +106,7 @@ decode_chunk(const uint8_t in[4], uint8_t out[3]) out[0] = (uint8_t)(((unmap(in[0]) << 2)) | unmap(in[1]) >> 4); out[1] = (uint8_t)(((unmap(in[1]) << 4) & 0xF0) | unmap(in[2]) >> 2); out[2] = (uint8_t)(((unmap(in[2]) << 6) & 0xC0) | unmap(in[3])); - return 1 + (in[2] != '=') + ((in[2] != '=') && (in[3] != '=')); + return 1U + (in[2] != '=') + ((in[2] != '=') && (in[3] != '=')); } SerdStatus @@ -119,7 +119,7 @@ serd_base64_decode(void* buf, size_t* size, const char* str, size_t len) uint8_t in[] = "===="; size_t n_in = 0; for (; i < len && n_in < 4; ++n_in) { - for (; i < len && !is_base64(ustr[i]); ++i) {} // Skip junk + for (; i < len && !is_base64(str[i]); ++i) {} // Skip junk in[n_in] = ustr[i++]; } if (n_in > 1) { |