diff options
author | David Robillard <d@drobilla.net> | 2016-03-16 16:21:20 -0400 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2021-03-07 15:32:23 -0500 |
commit | a29581d3ba664175c459e20e6c86be09707fde6e (patch) | |
tree | d11253ca88b09d7a768740b00332a4d780e3852d /src/base64.c | |
parent | 6e856d3e7a9c3162b9af350d5cec8a3f6bb94ee2 (diff) | |
download | serd-a29581d3ba664175c459e20e6c86be09707fde6e.tar.gz serd-a29581d3ba664175c459e20e6c86be09707fde6e.tar.bz2 serd-a29581d3ba664175c459e20e6c86be09707fde6e.zip |
Use char* for strings in public API
The constant casting just makes user code a mess, for no benefit.
Diffstat (limited to 'src/base64.c')
-rw-r--r-- | src/base64.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/base64.c b/src/base64.c index bca3dfd3..0edf8a0f 100644 --- a/src/base64.c +++ b/src/base64.c @@ -73,7 +73,6 @@ serd_base64_encode(uint8_t* const str, const bool wrap_lines) { bool has_newline = false; - for (size_t i = 0, j = 0; i < size; i += 3, j += 4) { uint8_t in[4] = {0, 0, 0, 0}; size_t n_in = MIN(3, size - i); @@ -107,26 +106,23 @@ decode_chunk(const uint8_t in[4], uint8_t out[3]) } void* -serd_base64_decode(const uint8_t* str, size_t len, size_t* size) +serd_base64_decode(const char* str, size_t len, size_t* size) { - void* buf = malloc((len * 3) / 4 + 2); + const uint8_t* const ustr = (const uint8_t*)str; - *size = 0; + void* buf = malloc((len * 3) / 4 + 2); + *size = 0; for (size_t i = 0, j = 0; i < len; j += 3) { uint8_t in[] = "===="; size_t n_in = 0; for (; i < len && n_in < 4; ++n_in) { - for (; i < len && !is_base64(str[i]); ++i) { - // Skip junk - } - - in[n_in] = str[i++]; + for (; i < len && !is_base64(ustr[i]); ++i) { + } // Skip junk + in[n_in] = ustr[i++]; } - if (n_in > 1) { *size += decode_chunk(in, (uint8_t*)buf + j); } } - return buf; } |