From 313a847b082dabcc529c1ec8b4252c9c854a888a Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Tue, 26 Jan 2016 14:34:57 +0000 Subject: [PATCH] =?utf8?q?mod=5Fhttp2:=20merge=20r1726798=20from=20trunk.?= =?utf8?q?=20Fix=20warnings:=20modules/http2/h2=5Futil.c|174|=20warning:?= =?utf8?q?=20suggest=20parentheses=20around=20=E2=80=98+=E2=80=99=20in=20o?= =?utf8?q?perand=20of=20=E2=80=98&=E2=80=99=20modules/http2/h2=5Futil.c|17?= =?utf8?q?6|=20warning:=20suggest=20parentheses=20around=20=E2=80=98+?= =?utf8?q?=E2=80=99=20in=20operand=20of=20=E2=80=98&=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1726801 13f79535-47bb-0310-9956-ffa450edef68 --- modules/http2/h2_util.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/http2/h2_util.c b/modules/http2/h2_util.c index 47e70843e9..58bdcf3cf3 100644 --- a/modules/http2/h2_util.c +++ b/modules/http2/h2_util.c @@ -170,10 +170,10 @@ const char *h2_util_base64url_encode(const char *data, enc = p; for (i = 0; i < mlen; i+= 3) { *p++ = BASE64URL_CHARS[ (udata[i] >> 2) & 0x3fu ]; - *p++ = BASE64URL_CHARS[ (udata[i] << 4) + - ((i+1 < len)? (udata[i+1] >> 4) : 0) & 0x3fu ]; - *p++ = BASE64URL_CHARS[ (udata[i+1] << 2) + - ((i+2 < len)? (udata[i+2] >> 6) : 0) & 0x3fu ]; + *p++ = BASE64URL_CHARS[ ((udata[i] << 4) + + ((i+1 < len)? (udata[i+1] >> 4) : 0)) & 0x3fu ]; + *p++ = BASE64URL_CHARS[ ((udata[i+1] << 2) + + ((i+2 < len)? (udata[i+2] >> 6) : 0)) & 0x3fu ]; if (i+2 < len) { *p++ = BASE64URL_CHARS[ udata[i+2] & 0x3fu ]; } -- 2.50.1