From: Anders Kaseorg <andersk@mit.edu>
Date: Sat, 5 Nov 2016 00:46:22 +0000 (-0400)
Subject: src/gtx/curseswindows.c: Fix misleading indentation
X-Git-Tag: upstream/1.6.21^2~54
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=beb36816528cd8f14860c65f77c27989e45ac40c;p=packages%2Fo%2Fopenafs.git

src/gtx/curseswindows.c: Fix misleading indentation

Fixes these warnings (errors with --enable-checking) from GCC 6.2:

curseswindows.c: In function ‘gator_cursesgwin_drawchar’:
curseswindows.c:574:5: error: this ‘if’ clause does not guard... [-Werror=misleading-indentation]
     if (params->highlight)
     ^~
curseswindows.c:576:9: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ‘if’
         if (code)
         ^~
curseswindows.c:579:5: error: this ‘if’ clause does not guard... [-Werror=misleading-indentation]
     if (params->highlight)
     ^~
curseswindows.c:581:9: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ‘if’
         if (code)
         ^~
curseswindows.c: In function ‘gator_cursesgwin_drawstring’:
curseswindows.c:628:5: error: this ‘if’ clause does not guard... [-Werror=misleading-indentation]
     if (params->highlight)
     ^~
curseswindows.c:630:2: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ‘if’
  if (code)
  ^~
curseswindows.c:633:5: error: this ‘if’ clause does not guard... [-Werror=misleading-indentation]
     if (params->highlight)
     ^~
curseswindows.c:635:2: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ‘if’
  if (code)
  ^~

Reviewed-on: https://gerrit.openafs.org/12439
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
(cherry picked from commit 85cf397ec18ecfde36433fb65e5d91ecd325b76e)

Change-Id: I33acb742a6c03046a0fa698bd08a910effc05de8
Reviewed-on: https://gerrit.openafs.org/12484
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
---

diff --git a/src/gtx/curseswindows.c b/src/gtx/curseswindows.c
index 9b524331e..87e0d040c 100644
--- a/src/gtx/curseswindows.c
+++ b/src/gtx/curseswindows.c
@@ -582,15 +582,17 @@ gator_cursesgwin_drawchar(struct gwin *gwp, struct gwin_charparams *params)
 		mn, rn, params->c, cwp->wp, params->x, params->y, curses_y,
 		curses_x, (params->highlight ? ", using standout mode" : ""));
     wmove(cwp->wp, curses_y, curses_x);
-    if (params->highlight)
+    if (params->highlight) {
 	code=wstandout(cwp->wp);
         if (code)
 	    return (code);
+    }
     waddch(cwp->wp, params->c);
-    if (params->highlight)
+    if (params->highlight) {
 	code=wstandend(cwp->wp);
         if (code)
             return (code);
+    }
 
     return (0);
 
@@ -636,15 +638,17 @@ gator_cursesgwin_drawstring(struct gwin *gwp, struct gwin_strparams *params)
 		mn, rn, params->s, cwp->wp, params->x, params->y, curses_y,
 		curses_x, (params->highlight ? ", using standout mode" : ""));
     wmove(cwp->wp, curses_y, curses_x);
-    if (params->highlight)
+    if (params->highlight) {
 	code=wstandout(cwp->wp);
 	if (code)
 	    return (code);
+    }
     waddstr(cwp->wp, params->s);
-    if (params->highlight)
+    if (params->highlight) {
 	code=wstandend(cwp->wp);
 	if (code)
 	    return (code);
+    }
 
     return (code);