From 1313be1536b97af21863683b27d022202341d78e Mon Sep 17 00:00:00 2001 From: dim Date: Tue, 4 Feb 2020 19:24:10 +0000 Subject: [PATCH] MFC r357269: Merge r357267 from the clang1000-import branch: Fix the following -Werror warning from clang 10.0.0 in tip: usr.bin/tip/tip/tip.c:428:4: error: misleading indentation; statement is not part of the previous 'if' [-Werror,-Wmisleading-indentation] if (gch == EOF) ^ usr.bin/tip/tip/tip.c:426:5: note: previous statement is here } else if (!cumode && gch == character(value(FORCE))) ^ The intent was to have the EOF check grouped with the getchar() call just above it. This was accidentally introduced in r354624. git-svn-id: svn://svn.freebsd.org/base/stable/10@357518 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- usr.bin/tip/tip/tip.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.bin/tip/tip/tip.c b/usr.bin/tip/tip/tip.c index 066d679c8..a6f7ba1ee 100644 --- a/usr.bin/tip/tip/tip.c +++ b/usr.bin/tip/tip/tip.c @@ -417,8 +417,9 @@ tipin(void) if (boolean(value(HALFDUPLEX))) printf("\r\n"); continue; - } else if (!cumode && gch == character(value(FORCE))) + } else if (!cumode && gch == character(value(FORCE))) { gch = getchar()&STRIP_PAR; + } bol = any(gch, value(EOL)); if (boolean(value(RAISE)) && islower(gch)) gch = toupper(gch); -- 2.42.0