From 11e7700e584e818b40013ef8e6bb17d04d8210f8 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 28 Feb 2018 18:33:45 -0500 Subject: Rename base64 routines to avoid conflict with Solaris built-in functions. Solaris 11.4 has built-in functions named b64_encode and b64_decode. Rename ours to something else to avoid the conflict (fortunately, ours are static so the impact is limited). One could wish for less duplication of code in this area, but that would be a larger patch and not very suitable for back-patching. Since this is a portability fix, we want to put it into all supported branches. Report and initial patch by Rainer Orth, reviewed and adjusted a bit by Michael Paquier Discussion: https://postgr.es/m/ydd372wk28h.fsf@CeBiTec.Uni-Bielefeld.DE --- src/backend/utils/adt/encode.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/backend/utils/adt/encode.c') diff --git a/src/backend/utils/adt/encode.c b/src/backend/utils/adt/encode.c index d833efc32cd..56786409255 100644 --- a/src/backend/utils/adt/encode.c +++ b/src/backend/utils/adt/encode.c @@ -215,7 +215,7 @@ static const int8 b64lookup[128] = { }; static unsigned -b64_encode(const char *src, unsigned len, char *dst) +pg_base64_encode(const char *src, unsigned len, char *dst) { char *p, *lend = dst + 76; @@ -262,7 +262,7 @@ b64_encode(const char *src, unsigned len, char *dst) } static unsigned -b64_decode(const char *src, unsigned len, char *dst) +pg_base64_decode(const char *src, unsigned len, char *dst) { const char *srcend = src + len, *s = src; @@ -332,14 +332,14 @@ b64_decode(const char *src, unsigned len, char *dst) static unsigned -b64_enc_len(const char *src, unsigned srclen) +pg_base64_enc_len(const char *src, unsigned srclen) { /* 3 bytes will be converted to 4, linefeed after 76 chars */ return (srclen + 2) * 4 / 3 + srclen / (76 * 3 / 4); } static unsigned -b64_dec_len(const char *src, unsigned srclen) +pg_base64_dec_len(const char *src, unsigned srclen) { return (srclen * 3) >> 2; } @@ -532,7 +532,7 @@ static const struct { "base64", { - b64_enc_len, b64_dec_len, b64_encode, b64_decode + pg_base64_enc_len, pg_base64_dec_len, pg_base64_encode, pg_base64_decode } }, { -- cgit v1.2.3