Module Name: src
Committed By: rillig
Date: Thu Nov 4 19:23:57 UTC 2021
Modified Files:
src/usr.bin/indent: io.c
Log Message:
indent: do not discard former error comments anymore
Since io.c 1.20 from 2019-10-19, indent has not placed error comments in
the code anymore. Since these comments are supposed to be cleaned up
immediately, there is no point in having code for handling them.
To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/usr.bin/indent/io.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/indent/io.c
diff -u src/usr.bin/indent/io.c:1.113 src/usr.bin/indent/io.c:1.114
--- src/usr.bin/indent/io.c:1.113 Thu Nov 4 17:10:37 2021
+++ src/usr.bin/indent/io.c Thu Nov 4 19:23:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: io.c,v 1.113 2021/11/04 17:10:37 rillig Exp $ */
+/* $NetBSD: io.c,v 1.114 2021/11/04 19:23:57 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)io.c 8.1 (Be
#include <sys/cdefs.h>
#if defined(__NetBSD__)
-__RCSID("$NetBSD: io.c,v 1.113 2021/11/04 17:10:37 rillig Exp $");
+__RCSID("$NetBSD: io.c,v 1.114 2021/11/04 19:23:57 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/io.c 334927 2018-06-10 16:44:18Z pstef $");
#endif
@@ -450,12 +450,8 @@ inbuf_read_line(void)
inp.s = inp.buf;
inp.e = p;
- if (p - inp.s >= 3 && p[-3] == '*' && p[-2] == '/') {
- if (strncmp(inp.s, "/**INDENT**", 11) == 0)
- inbuf_read_line(); /* flush indent error message */
- else
- parse_indent_comment();
- }
+ if (p - inp.s >= 3 && p[-3] == '*' && p[-2] == '/')
+ parse_indent_comment();
if (inhibit_formatting)
output_range(inp.s, inp.e);
