From 8906a4d33504561cbdbb56187d04eeaa83476b21 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 21 Feb 2018 21:43:44 +0100 Subject: [PATCH] Cygwin: fix whitespaces in socket code Signed-off-by: Corinna Vinschen --- winsup/cygwin/fhandler_socket_inet.cc | 10 +++++----- winsup/cygwin/fhandler_socket_local.cc | 2 +- winsup/cygwin/syslog.cc | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/winsup/cygwin/fhandler_socket_inet.cc b/winsup/cygwin/fhandler_socket_inet.cc index 91da47cd1..a161050e4 100644 --- a/winsup/cygwin/fhandler_socket_inet.cc +++ b/winsup/cygwin/fhandler_socket_inet.cc @@ -203,7 +203,7 @@ fhandler_socket_inet::connect (const struct sockaddr *name, int namelen) if (res) { DWORD err = WSAGetLastError (); - + /* Some applications use the ugly technique to check if a non-blocking connect succeeded by calling connect again, until it returns EISCONN. This circumvents the event handling and connect_state is never set. @@ -215,13 +215,13 @@ fhandler_socket_inet::connect (const struct sockaddr *name, int namelen) else if (is_nonblocking () && err == WSAEWOULDBLOCK) WSASetLastError (WSAEINPROGRESS); /* Winsock returns WSAEINVAL if the socket is already a listener. - Convert to POSIX/Linux compliant EISCONN. */ + Convert to POSIX/Linux compliant EISCONN. */ else if (err == WSAEINVAL && connect_state () == listener) WSASetLastError (WSAEISCONN); /* Any other error except WSAEALREADY during connect_pending means the connect failed. */ else if (connect_state () == connect_pending && err != WSAEALREADY) - connect_state (connect_failed); + connect_state (connect_failed); set_winsock_errno (); } @@ -631,7 +631,7 @@ fhandler_socket_inet::read (void *in_ptr, size_t& len) WSABUF wsabuf = { len, ptr }; WSAMSG wsamsg = { NULL, 0, &wsabuf, 1, { 0, NULL }, 0 }; #endif - + len = recv_internal (&wsamsg, false); } @@ -1132,7 +1132,7 @@ fhandler_socket_inet::getsockopt (int level, int optname, const void *optval, break; } break; - case IPPROTO_TCP: + case IPPROTO_TCP: switch (optname) { case TCP_NODELAY: diff --git a/winsup/cygwin/fhandler_socket_local.cc b/winsup/cygwin/fhandler_socket_local.cc index 3d48a8159..ca1fe5e3c 100644 --- a/winsup/cygwin/fhandler_socket_local.cc +++ b/winsup/cygwin/fhandler_socket_local.cc @@ -1310,7 +1310,7 @@ fhandler_socket_local::read (void *in_ptr, size_t& len) WSABUF wsabuf = { len, ptr }; WSAMSG wsamsg = { NULL, 0, &wsabuf, 1, { 0, NULL }, 0 }; #endif - + len = recv_internal (&wsamsg, false); } diff --git a/winsup/cygwin/syslog.cc b/winsup/cygwin/syslog.cc index 7ea00d7c3..2f4e5e8c0 100644 --- a/winsup/cygwin/syslog.cc +++ b/winsup/cygwin/syslog.cc @@ -251,7 +251,7 @@ connect_syslogd () syslogd_inited = inited_dgram; } else - close (fd); + close (fd); } syslogd_sock = fd; debug_printf ("found /dev/log, fd = %d, type = %s",