Module Name: src
Committed By: rillig
Date: Sat Sep 25 18:49:03 UTC 2021
Modified Files:
src/usr.bin/indent: args.c indent.c indent_globs.h
Log Message:
indent: rename option variable to be more expressive
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/indent/args.c
cvs rdiff -u -r1.75 -r1.76 src/usr.bin/indent/indent.c
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/indent/indent_globs.h
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/args.c
diff -u src/usr.bin/indent/args.c:1.26 src/usr.bin/indent/args.c:1.27
--- src/usr.bin/indent/args.c:1.26 Sat Sep 25 17:20:02 2021
+++ src/usr.bin/indent/args.c Sat Sep 25 18:49:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: args.c,v 1.26 2021/09/25 17:20:02 rillig Exp $ */
+/* $NetBSD: args.c,v 1.27 2021/09/25 18:49:03 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)args.c 8.1 (
#include <sys/cdefs.h>
#if defined(__NetBSD__)
-__RCSID("$NetBSD: args.c,v 1.26 2021/09/25 17:20:02 rillig Exp $");
+__RCSID("$NetBSD: args.c,v 1.27 2021/09/25 18:49:03 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/args.c 336318 2018-07-15 21:04:21Z pstef $");
#endif
@@ -123,7 +123,7 @@ const struct pro {
bool_option("bc", OFF, opt.leave_comma),
bool_option("bl", OFF, opt.btype_2),
bool_option("br", ON, opt.btype_2),
- bool_option("bs", ON, opt.Bill_Shannon),
+ bool_option("bs", ON, opt.blank_after_sizeof),
bool_option("cdb", ON, opt.comment_delimiter_on_blankline),
int_option("cd", 0, opt.decl_comment_column),
bool_option("ce", ON, opt.cuddle_else),
@@ -152,7 +152,7 @@ const struct pro {
bool_option("nbap", OFF, opt.blanklines_after_procs),
bool_option("nbbb", OFF, opt.blanklines_before_blockcomments),
bool_option("nbc", ON, opt.leave_comma),
- bool_option("nbs", OFF, opt.Bill_Shannon),
+ bool_option("nbs", OFF, opt.blank_after_sizeof),
bool_option("ncdb", OFF, opt.comment_delimiter_on_blankline),
bool_option("nce", OFF, opt.cuddle_else),
bool_option("ncs", OFF, opt.space_after_cast),
Index: src/usr.bin/indent/indent.c
diff -u src/usr.bin/indent/indent.c:1.75 src/usr.bin/indent/indent.c:1.76
--- src/usr.bin/indent/indent.c:1.75 Sat Sep 25 17:36:51 2021
+++ src/usr.bin/indent/indent.c Sat Sep 25 18:49:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: indent.c,v 1.75 2021/09/25 17:36:51 rillig Exp $ */
+/* $NetBSD: indent.c,v 1.76 2021/09/25 18:49:03 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.75 2021/09/25 17:36:51 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.76 2021/09/25 18:49:03 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/indent.c 340138 2018-11-04 19:24:49Z oshogbo $");
#endif
@@ -594,7 +594,7 @@ process_lparen_or_lbracket(int dec_ind,
} else if (ps.want_blank &&
((ps.last_token != ident && ps.last_token != funcname) ||
opt.proc_calls_space ||
- (ps.keyword == rw_sizeof ? opt.Bill_Shannon :
+ (ps.keyword == rw_sizeof ? opt.blank_after_sizeof :
ps.keyword != rw_0 && ps.keyword != rw_offsetof)))
*code.e++ = ' ';
ps.want_blank = false;
Index: src/usr.bin/indent/indent_globs.h
diff -u src/usr.bin/indent/indent_globs.h:1.32 src/usr.bin/indent/indent_globs.h:1.33
--- src/usr.bin/indent/indent_globs.h:1.32 Sat Sep 25 17:36:51 2021
+++ src/usr.bin/indent/indent_globs.h Sat Sep 25 18:49:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: indent_globs.h,v 1.32 2021/09/25 17:36:51 rillig Exp $ */
+/* $NetBSD: indent_globs.h,v 1.33 2021/09/25 18:49:03 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -93,7 +93,7 @@ extern struct options {
* commas */
bool btype_2; /* whether brace should be on same line
* as if, while, etc */
- bool Bill_Shannon; /* whether a blank should always be
+ bool blank_after_sizeof; /* whether a blank should always be
* inserted after sizeof */
bool comment_delimiter_on_blankline;
int decl_comment_column; /* the column in which comments after
