From: Tokunori Ikegami <ikegami.t@gmail.com> Date: Sun, 28 May 2023 12:52:30 +0000 (+0900) Subject: util: Fix base64.c linux kernel check patch errors and warnings X-Git-Tag: v2.5~76 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3d6f1830b51b37ccf7bbf275a21cbad90b655354;p=users%2Fsagi%2Fnvme-cli.git util: Fix base64.c linux kernel check patch errors and warnings Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com> --- diff --git a/util/base64.c b/util/base64.c index 07f975c8..7f47cda6 100644 --- a/util/base64.c +++ b/util/base64.c @@ -81,24 +81,24 @@ int base64_decode(const char *src, int srclen, unsigned char *dst) int i, bits = 0; unsigned char *bp = dst; - for (i = 0; i < srclen; i++) { - const char *p = strchr(base64_table, src[i]); + for (i = 0; i < srclen; i++) { + const char *p = strchr(base64_table, src[i]); - if (src[i] == '=') { - ac = (ac << 6); + if (src[i] == '=') { + ac = (ac << 6); bits += 6; if (bits >= 8) bits -= 8; - continue; - } - if (p == NULL || src[i] == 0) - return -EINVAL; - ac = (ac << 6) | (p - base64_table); - bits += 6; - if (bits >= 8) { - bits -= 8; - *bp++ = (unsigned char)(ac >> bits); - } + continue; + } + if (!p || !src[i]) + return -EINVAL; + ac = (ac << 6) | (p - base64_table); + bits += 6; + if (bits >= 8) { + bits -= 8; + *bp++ = (unsigned char)(ac >> bits); + } } if (ac && ((1 << bits) - 1)) return -EAGAIN;