From dbf55f6694dbf710b44e3ae76a46fd8b8f993f7c Mon Sep 17 00:00:00 2001 From: RV971 Date: Fri, 29 Nov 2013 15:35:33 +0000 Subject: [PATCH] base64: fix recent compilation regression on some compilers This fixes a compile failure with "Sun C 5.8 Patch 121015-05 2007/08/01" which returns: "base64.c", line 99: void function cannot return value * lib/base64.c: Don't return the void function, instead split to a separate return statement. --- ChangeLog | 6 ++++++ lib/base64.c | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 21659eafe..4765a7d30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-11-29 RV1971 + + base64: (trivial) fix compilation regression on some compilers + * lib/base64.c: Don't return the void function, + instead split to a separate return statement. + 2013-11-28 Paul Eggert ignore-value: revert previous code change diff --git a/lib/base64.c b/lib/base64.c index 99c2d2e56..b8a52fd88 100644 --- a/lib/base64.c +++ b/lib/base64.c @@ -96,7 +96,10 @@ base64_encode (const char *restrict in, size_t inlen, large inputs is to have both constraints satisfied, so we depend on both in base_encode_fast(). */ if (outlen % 4 == 0 && inlen == outlen / 4 * 3) - return base64_encode_fast (in, inlen, out); + { + base64_encode_fast (in, inlen, out); + return; + } while (inlen && outlen) { -- 2.11.0