This is the mail archive of the
cygwin-patches
mailing list for the Cygwin project.
[PATCH v2 3/5] Remove misleading indentation
- From: Peter Foley <pefoley2 at pefoley dot com>
- To: cygwin-patches at cygwin dot com
- Cc: Peter Foley <pefoley2 at pefoley dot com>
- Date: Mon, 21 Mar 2016 13:15:44 -0400
- Subject: [PATCH v2 3/5] Remove misleading indentation
- Authentication-results: sourceware.org; auth=none
- References: <1458580546-14484-1-git-send-email-pefoley2 at pefoley dot com>
- References: <1458409557-13156-1-git-send-email-pefoley2 at pefoley dot com> <1458409557-13156-4-git-send-email-pefoley2 at pefoley dot com> <20160320110319 dot GF25241 at calimero dot vinschen dot de>
GCC 6.0+ warns on misleading indentation, so fix it.
winsup/cygserver/ChangeLog
* sysv_msg.cc (msgsnd): Fix misleading indentation.
* sysv_msg.cc (msgrcv): Ditto.
* sysv_sem.cc (semop): Ditto.
Signed-off-by: Peter Foley <pefoley2@pefoley.com>
---
winsup/cygserver/sysv_msg.cc | 6 ++++--
winsup/cygserver/sysv_sem.cc | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/winsup/cygserver/sysv_msg.cc b/winsup/cygserver/sysv_msg.cc
index 217cc1d..9e90d05 100644
--- a/winsup/cygserver/sysv_msg.cc
+++ b/winsup/cygserver/sysv_msg.cc
@@ -733,7 +733,8 @@ msgsnd(struct thread *td, struct msgsnd_args *uap)
if (error != 0) {
DPRINTF(("msgsnd: interrupted system call\n"));
#ifdef __CYGWIN__
- if (error != EIDRM)
+ if (error == EIDRM)
+ goto done2;
#endif /* __CYGWIN__ */
error = EINTR;
goto done2;
@@ -1089,7 +1090,8 @@ msgrcv(struct thread *td, struct msgrcv_args *uap)
if (error != 0) {
DPRINTF(("msgrcv: interrupted system call\n"));
#ifdef __CYGWIN__
- if (error != EIDRM)
+ if (error == EIDRM)
+ goto done2;
#endif /* __CYGWIN__ */
error = EINTR;
goto done2;
diff --git a/winsup/cygserver/sysv_sem.cc b/winsup/cygserver/sysv_sem.cc
index e7ba48b..349322c 100644
--- a/winsup/cygserver/sysv_sem.cc
+++ b/winsup/cygserver/sysv_sem.cc
@@ -1177,7 +1177,8 @@ semop(struct thread *td, struct semop_args *uap)
*/
if (error != 0) {
#ifdef __CYGWIN__
- if (error != EIDRM)
+ if (error == EIDRM)
+ goto done2;
#endif /* __CYGWIN__ */
error = EINTR;
goto done2;
--
2.7.4