Module Name: src
Committed By: rillig
Date: Sun Nov 7 10:42:58 UTC 2021
Modified Files:
src/tests/usr.bin/indent: t_errors.sh
src/usr.bin/indent: pr_comment.c
Log Message:
indent: remove redundant assignment
At that point, ps.next_col_1 is already false.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/tests/usr.bin/indent/t_errors.sh
cvs rdiff -u -r1.107 -r1.108 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/tests/usr.bin/indent/t_errors.sh
diff -u src/tests/usr.bin/indent/t_errors.sh:1.17 src/tests/usr.bin/indent/t_errors.sh:1.18
--- src/tests/usr.bin/indent/t_errors.sh:1.17 Sat Oct 30 16:57:18 2021
+++ src/tests/usr.bin/indent/t_errors.sh Sun Nov 7 10:42:58 2021
@@ -1,5 +1,5 @@
#! /bin/sh
-# $NetBSD: t_errors.sh,v 1.17 2021/10/30 16:57:18 rillig Exp $
+# $NetBSD: t_errors.sh,v 1.18 2021/11/07 10:42:58 rillig Exp $
#
# Copyright (c) 2021 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -174,8 +174,8 @@ option_special_missing_param_body()
-U
}
-atf_test_case 'unterminated_comment'
-unterminated_comment_body()
+atf_test_case 'unterminated_comment_wrap'
+unterminated_comment_wrap_body()
{
echo '/*' > comment.c
@@ -185,6 +185,17 @@ unterminated_comment_body()
"$indent" -st < comment.c
}
+atf_test_case 'unterminated_comment_nowrap'
+unterminated_comment_nowrap_body()
+{
+ echo '/*-' > comment.c
+
+ atf_check -s 'exit:1' \
+ -o 'inline:/*-'"$nl$nl" \
+ -e 'inline:error: Standard Input:2: Unterminated comment'"$nl" \
+ "$indent" -st < comment.c
+}
+
atf_test_case 'in_place_wrong_backup'
in_place_wrong_backup_body()
{
@@ -479,7 +490,8 @@ atf_init_test_cases()
atf_add_test_case 'option_int_trailing_garbage'
atf_add_test_case 'option_cli_trailing_garbage'
atf_add_test_case 'option_indent_size_zero'
- atf_add_test_case 'unterminated_comment'
+ atf_add_test_case 'unterminated_comment_wrap'
+ atf_add_test_case 'unterminated_comment_nowrap'
atf_add_test_case 'in_place_wrong_backup'
atf_add_test_case 'argument_input_enoent'
atf_add_test_case 'argument_output_equals_input_name'
Index: src/usr.bin/indent/pr_comment.c
diff -u src/usr.bin/indent/pr_comment.c:1.107 src/usr.bin/indent/pr_comment.c:1.108
--- src/usr.bin/indent/pr_comment.c:1.107 Sun Nov 7 10:34:03 2021
+++ src/usr.bin/indent/pr_comment.c Sun Nov 7 10:42:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pr_comment.c,v 1.107 2021/11/07 10:34:03 rillig Exp $ */
+/* $NetBSD: pr_comment.c,v 1.108 2021/11/07 10:42:58 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.107 2021/11/07 10:34:03 rillig Exp $");
+__RCSID("$NetBSD: pr_comment.c,v 1.108 2021/11/07 10:42:58 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/pr_comment.c 334927 2018-06-10 16:44:18Z pstef $");
#endif
@@ -358,7 +358,6 @@ copy_comment_nowrap(void)
finish:
com_terminate();
- ps.next_col_1 = false;
}
/*
