Module Name: src
Committed By: rillig
Date: Sun Nov 7 11:08:25 UTC 2021
Modified Files:
src/usr.bin/indent: pr_comment.c
Log Message:
indent: remove dead code from copy_comment_wrap
C99 comments are not wrapped, therefore there is no need to check for
them in copy_comment_wrap.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/usr.bin/indent/pr_comment.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/pr_comment.c
diff -u src/usr.bin/indent/pr_comment.c:1.110 src/usr.bin/indent/pr_comment.c:1.111
--- src/usr.bin/indent/pr_comment.c:1.110 Sun Nov 7 10:56:06 2021
+++ src/usr.bin/indent/pr_comment.c Sun Nov 7 11:08:25 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pr_comment.c,v 1.110 2021/11/07 10:56:06 rillig Exp $ */
+/* $NetBSD: pr_comment.c,v 1.111 2021/11/07 11:08:25 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)pr_comment.c
#include <sys/cdefs.h>
#if defined(__NetBSD__)
-__RCSID("$NetBSD: pr_comment.c,v 1.110 2021/11/07 10:56:06 rillig Exp $");
+__RCSID("$NetBSD: pr_comment.c,v 1.111 2021/11/07 11:08:25 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/pr_comment.c 334927 2018-06-10 16:44:18Z pstef $");
#endif
@@ -224,9 +224,6 @@ copy_comment_wrap(int adj_max_line_lengt
break;
case '\n':
- if (token.e[-1] == '/')
- goto end_of_line_comment;
-
if (had_eof) {
diag(1, "Unterminated comment");
dump_line();
@@ -268,11 +265,10 @@ copy_comment_wrap(int adj_max_line_lengt
case '*':
inp_skip();
- if (*inp.s == '/' && token.e[-1] == '*') {
+ if (*inp.s == '/') {
end_of_comment:
inp_skip();
- end_of_line_comment:
if (break_delim) {
if (com.e > com.s + 3)
dump_line();
@@ -283,10 +279,8 @@ copy_comment_wrap(int adj_max_line_lengt
if (!ch_isblank(com.e[-1]))
com_add_char(' ');
- if (token.e[-1] == '*') {
- com_add_char('*');
- com_add_char('/');
- }
+ com_add_char('*');
+ com_add_char('/');
com_terminate();
return;
