From: Andre Noll Date: Thu, 30 Apr 2015 07:06:35 +0000 (+0200) Subject: base64: Trivial whitespace fixes. X-Git-Tag: v0.5.7~20^2~2 X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=ba4b798fbe3bf4d56cf51f91456b602cd1ed9083;hp=6f97ddef03af932b5b0466499e8fe9c336c9abf4 base64: Trivial whitespace fixes. --- diff --git a/base64.c b/base64.c index 9188e92b..d9fa483b 100644 --- a/base64.c +++ b/base64.c @@ -90,20 +90,18 @@ int base64_decode(char const *src, size_t encoded_size, char **result, break; } } - /* * We are done decoding Base-64 chars. Let's see if we ended * on a byte boundary, and/or with erroneous trailing characters. */ - - if (*src == PAD64) { /* We got a pad char. */ - ch = *src++; /* Skip it, get next. */ + if (*src == PAD64) { /* We got a pad char. */ + ch = *src++; /* Skip it, get next. */ switch (state) { - case 0: /* Invalid = in first position */ - case 1: /* Invalid = in second position */ + case 0: /* Invalid = in first position */ + case 1: /* Invalid = in second position */ goto fail; - case 2: /* Valid, means one byte of info */ + case 2: /* Valid, means one byte of info */ /* Skip any number of spaces. */ for (; ch != '\0'; ch = *src++) if (!isspace(ch)) @@ -113,9 +111,8 @@ int base64_decode(char const *src, size_t encoded_size, char **result, goto fail; ch = *src++; /* Skip the = */ /* Fall through to "single trailing =" case. */ - /* FALLTHROUGH */ - case 3: /* Valid, means two bytes of info */ + case 3: /* Valid, means two bytes of info */ /* * We know this char is an =. Is there anything but * whitespace after it? @@ -123,7 +120,6 @@ int base64_decode(char const *src, size_t encoded_size, char **result, for (; ch != '\0'; ch = *src++) if (!isspace(ch)) goto fail; - /* * Now make sure for cases 2 and 3 that the "extra" * bits that slopped past the last full byte were