Author: dim
Date: Tue Feb 4 19:24:10 2020
New Revision: 357518
URL: https://svnweb.freebsd.org/changeset/base/357518
Log:
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.
Modified:
stable/10/usr.bin/tip/tip/tip.c
Directory Properties:
stable/10/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/usr.bin/tip/tip/tip.c
stable/12/usr.bin/tip/tip/tip.c
Directory Properties:
stable/11/ (props changed)
stable/12/ (props changed)
Modified: stable/10/usr.bin/tip/tip/tip.c
==============================================================================
--- stable/10/usr.bin/tip/tip/tip.c Tue Feb 4 19:19:48 2020
(r357517)
+++ stable/10/usr.bin/tip/tip/tip.c Tue Feb 4 19:24:10 2020
(r357518)
@@ -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);
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "[email protected]"
