Module Name: src
Committed By: rillig
Date: Sat Oct 30 10:59:07 UTC 2021
Modified Files:
src/usr.bin/indent: indent.c
Log Message:
indent: remove confusing modulo from code_add_decl_indent
The only effects of the modulo operation was to make indent slower and
to confuse human readers.
During the computation of the indentation, the main focus is on the
difference between the current indentation, as computed from the base
indentation and the current code, and the target indentation. All these
computations take opt.tabsize into account. When looking only at the
difference, whether or not a multiple of opt.tabsize is added does not
matter.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.182 -r1.183 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/usr.bin/indent/indent.c
diff -u src/usr.bin/indent/indent.c:1.182 src/usr.bin/indent/indent.c:1.183
--- src/usr.bin/indent/indent.c:1.182 Sat Oct 30 10:01:31 2021
+++ src/usr.bin/indent/indent.c Sat Oct 30 10:59:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: indent.c,v 1.182 2021/10/30 10:01:31 rillig Exp $ */
+/* $NetBSD: indent.c,v 1.183 2021/10/30 10:59:07 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.182 2021/10/30 10:01:31 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.183 2021/10/30 10:59:07 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/indent.c 340138 2018-11-04 19:24:49Z oshogbo $");
#endif
@@ -610,9 +610,9 @@ code_add_decl_indent(int cur_decl_ind, b
* get the tab math right for indentations that are not multiples of
* tabsize
*/
- if ((ps.ind_level * opt.indent_size) % opt.tabsize != 0) {
- ind += (ps.ind_level * opt.indent_size) % opt.tabsize;
- cur_decl_ind += (ps.ind_level * opt.indent_size) % opt.tabsize;
+ if (ps.ind_level * opt.indent_size != 0) {
+ ind += ps.ind_level * opt.indent_size;
+ cur_decl_ind += ps.ind_level * opt.indent_size;
}
if (tabs_to_var) {
