Module Name: src
Committed By: rillig
Date: Tue Oct 5 17:14:45 UTC 2021
Modified Files:
src/tests/usr.bin/indent: ps_ind_level.0.stdout
src/usr.bin/indent: indent.c
Log Message:
indent: fix off-by-one error for indented first line
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/indent/ps_ind_level.0.stdout
cvs rdiff -u -r1.106 -r1.107 src/usr.bin/indent/indent.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/ps_ind_level.0.stdout
diff -u src/tests/usr.bin/indent/ps_ind_level.0.stdout:1.1 src/tests/usr.bin/indent/ps_ind_level.0.stdout:1.2
--- src/tests/usr.bin/indent/ps_ind_level.0.stdout:1.1 Tue Oct 5 17:09:45 2021
+++ src/tests/usr.bin/indent/ps_ind_level.0.stdout Tue Oct 5 17:14:45 2021
@@ -1,9 +1,8 @@
-/* $NetBSD: ps_ind_level.0.stdout,v 1.1 2021/10/05 17:09:45 rillig Exp $ */
+/* $NetBSD: ps_ind_level.0.stdout,v 1.2 2021/10/05 17:14:45 rillig Exp $ */
/* $FreeBSD$ */
/* $ */
-/* $ FIXME: indentation should be 20 instead of 25. */
- int declaration_in_column_25;
+ int declaration_in_column_25;
/* $ FIXME: The space between '){' is missing. */
- void function_in_column_1(void){
- }
+ void function_in_column_1(void){
+ }
Index: src/usr.bin/indent/indent.c
diff -u src/usr.bin/indent/indent.c:1.106 src/usr.bin/indent/indent.c:1.107
--- src/usr.bin/indent/indent.c:1.106 Tue Oct 5 17:12:20 2021
+++ src/usr.bin/indent/indent.c Tue Oct 5 17:14:45 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: indent.c,v 1.106 2021/10/05 17:12:20 rillig Exp $ */
+/* $NetBSD: indent.c,v 1.107 2021/10/05 17:14:45 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)indent.c 5.1
#include <sys/cdefs.h>
#if defined(__NetBSD__)
-__RCSID("$NetBSD: indent.c,v 1.106 2021/10/05 17:12:20 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.107 2021/10/05 17:14:45 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/indent.c 340138 2018-11-04 19:24:49Z oshogbo $");
#endif
@@ -513,7 +513,7 @@ main_prepare_parsing(void)
p++;
}
if (ind >= opt.indent_size)
- ps.ind_level = ps.ind_level_follow = (ind + 1) / opt.indent_size;
+ ps.ind_level = ps.ind_level_follow = ind / opt.indent_size;
}
static void __attribute__((__noreturn__))
