]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
src/gtx/curseswindows.c: Fix misleading indentation
authorAnders Kaseorg <andersk@mit.edu>
Sat, 5 Nov 2016 00:46:22 +0000 (20:46 -0400)
committerStephan Wiesand <stephan.wiesand@desy.de>
Wed, 14 Dec 2016 17:30:40 +0000 (12:30 -0500)
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>
src/gtx/curseswindows.c

index 9b524331ea007321f0de23f6e7e073fae15be424..87e0d040cbf1b4bd03afa77d0b90523a2786d21e 100644 (file)
@@ -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);