From d700c33422926dda1b4af90bf1fcd262b03cfca8 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 28 Jan 2016 21:19:41 +0000 Subject: [PATCH] Avoid -Wmisleading-indentation warnings with GCC 6. GCC 6 warns about potentially misleading indentation, such as: if (condition) stmt1; stmt2; Chaining multiple ifs on a single line runs into this warning, even if it's probably not actually misleading to a human eye, so just add a couple of newlines to pacify the compiler. --- cproxy.c | 3 ++- proxy.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cproxy.c b/cproxy.c index 5f2f15fc..4f9a3ffa 100644 --- a/cproxy.c +++ b/cproxy.c @@ -173,7 +173,8 @@ int proxy_socks5_selectchap(Proxy_Socket p) chapbuf[5] = '\x02'; /* Second attribute - username */ ulen = strlen(username); - if (ulen > 255) ulen = 255; if (ulen < 1) ulen = 1; + if (ulen > 255) ulen = 255; + if (ulen < 1) ulen = 1; chapbuf[6] = ulen; memcpy(chapbuf+7, username, ulen); diff --git a/proxy.c b/proxy.c index 5b77bc76..f9f2cd62 100644 --- a/proxy.c +++ b/proxy.c @@ -1246,9 +1246,11 @@ int proxy_socks5_negotiate (Proxy_Socket p, int change) char userpwbuf[255 + 255 + 3]; int ulen, plen; ulen = strlen(username); - if (ulen > 255) ulen = 255; if (ulen < 1) ulen = 1; + if (ulen > 255) ulen = 255; + if (ulen < 1) ulen = 1; plen = strlen(password); - if (plen > 255) plen = 255; if (plen < 1) plen = 1; + if (plen > 255) plen = 255; + if (plen < 1) plen = 1; userpwbuf[0] = 1; /* version number of subnegotiation */ userpwbuf[1] = ulen; memcpy(userpwbuf+2, username, ulen); -- 2.45.2