From: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com> Date: Sat, 17 Jul 2021 07:28:39 +0000 (+0200) Subject: Fix Linux kernel coding style warning X-Git-Tag: v8.20~91^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=951e55ee28e12a92acc5a8acab25ec646237b44d;p=users%2Fdwmw2%2Fopenconnect.git Fix Linux kernel coding style warning suspect code indent for conditional statements This commit fixes a couple obvious occurrences of this warning. The rest need not be fixed or will be fixed in the future, together with other issues. Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com> --- diff --git a/compat.c b/compat.c index 0efe2a64..65c0a433 100644 --- a/compat.c +++ b/compat.c @@ -382,8 +382,8 @@ WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH OPENCONNECT_CMD_SOCKET dumb_socketpair(OPENCONNECT_CMD_SOCKET socks[2], int make_overlapped) { union { - struct sockaddr_in inaddr; - struct sockaddr addr; + struct sockaddr_in inaddr; + struct sockaddr addr; } a; OPENCONNECT_CMD_SOCKET listener; int e; @@ -392,8 +392,8 @@ OPENCONNECT_CMD_SOCKET dumb_socketpair(OPENCONNECT_CMD_SOCKET socks[2], int make int reuse = 1; if (socks == 0) { - WSASetLastError(WSAEINVAL); - return SOCKET_ERROR; + WSASetLastError(WSAEINVAL); + return SOCKET_ERROR; } listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); @@ -410,11 +410,11 @@ OPENCONNECT_CMD_SOCKET dumb_socketpair(OPENCONNECT_CMD_SOCKET socks[2], int make if (setsockopt(listener, SOL_SOCKET, SO_REUSEADDR, (char *) &reuse, (socklen_t) sizeof(reuse)) == -1) break; - if (bind(listener, &a.addr, sizeof(a.inaddr)) == SOCKET_ERROR) + if (bind(listener, &a.addr, sizeof(a.inaddr)) == SOCKET_ERROR) break; memset(&a, 0, sizeof(a)); - if (getsockname(listener, &a.addr, &addrlen) == SOCKET_ERROR) + if (getsockname(listener, &a.addr, &addrlen) == SOCKET_ERROR) break; // win32 getsockname may only set the port number, p=0.0005. // ( https://docs.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-getsockname ): diff --git a/ppp.c b/ppp.c index 8eba3c1b..cfffe923 100644 --- a/ppp.c +++ b/ppp.c @@ -57,7 +57,7 @@ static const uint16_t fcstab[256] = { 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78 }; -#define foldfcs(fcs, c) ( ( (fcs) >> 8 ) ^ fcstab[(fcs ^ (c)) & 0xff] ) +#define foldfcs(fcs, c) ( ( (fcs) >> 8 ) ^ fcstab[(fcs ^ (c)) & 0xff] ) #define NEED_ESCAPE(c, map) ( (((c) < 0x20) && (map && (1UL << (c)))) || ((c) == 0x7d) || ((c) == 0x7e) ) #define HDLC_OUT(outp, c, map) do { \ if (NEED_ESCAPE((c), map)) { \