Module Name: src
Committed By: rillig
Date: Sat Sep 25 22:54:32 UTC 2021
Modified Files:
src/usr.bin/indent: indent.c indent_globs.h io.c
Log Message:
indent: convert found_err to bool
That variable had slipped through the migration since it consequently
used int for the declaration, the definition and all assignments.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/usr.bin/indent/indent.c
cvs rdiff -u -r1.35 -r1.36 src/usr.bin/indent/indent_globs.h
cvs rdiff -u -r1.64 -r1.65 src/usr.bin/indent/io.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.82 src/usr.bin/indent/indent.c:1.83
--- src/usr.bin/indent/indent.c:1.82 Sat Sep 25 22:24:35 2021
+++ src/usr.bin/indent/indent.c Sat Sep 25 22:54:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: indent.c,v 1.82 2021/09/25 22:24:35 rillig Exp $ */
+/* $NetBSD: indent.c,v 1.83 2021/09/25 22:54:32 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.82 2021/09/25 22:24:35 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.83 2021/09/25 22:54:32 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/indent.c 340138 2018-11-04 19:24:49Z oshogbo $");
#endif
@@ -105,7 +105,7 @@ char *sc_end;
char *bp_save;
char *be_save;
-int found_err;
+bool found_err;
int n_real_blanklines;
bool prefix_blankline_requested;
bool postfix_blankline_requested;
@@ -376,7 +376,7 @@ buf_expand(struct buffer *buf, size_t de
static void
main_init_globals(void)
{
- found_err = 0;
+ found_err = false;
ps.p_stack[0] = stmt; /* this is the parser's stack */
ps.last_nl = true; /* this is true if the last thing scanned was
@@ -510,7 +510,7 @@ process_end_of_file(void)
}
fflush(output);
- exit(found_err);
+ exit(found_err ? EXIT_FAILURE : EXIT_SUCCESS);
}
static void
Index: src/usr.bin/indent/indent_globs.h
diff -u src/usr.bin/indent/indent_globs.h:1.35 src/usr.bin/indent/indent_globs.h:1.36
--- src/usr.bin/indent/indent_globs.h:1.35 Sat Sep 25 20:56:53 2021
+++ src/usr.bin/indent/indent_globs.h Sat Sep 25 22:54:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: indent_globs.h,v 1.35 2021/09/25 20:56:53 rillig Exp $ */
+/* $NetBSD: indent_globs.h,v 1.36 2021/09/25 22:54:32 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -173,7 +173,7 @@ enum rwcode {
};
-extern int found_err;
+extern bool found_err;
extern int n_real_blanklines;
extern bool prefix_blankline_requested;
extern bool postfix_blankline_requested;
Index: src/usr.bin/indent/io.c
diff -u src/usr.bin/indent/io.c:1.64 src/usr.bin/indent/io.c:1.65
--- src/usr.bin/indent/io.c:1.64 Sat Sep 25 20:56:53 2021
+++ src/usr.bin/indent/io.c Sat Sep 25 22:54:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: io.c,v 1.64 2021/09/25 20:56:53 rillig Exp $ */
+/* $NetBSD: io.c,v 1.65 2021/09/25 22:54:32 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)io.c 8.1 (Be
#include <sys/cdefs.h>
#if defined(__NetBSD__)
-__RCSID("$NetBSD: io.c,v 1.64 2021/09/25 20:56:53 rillig Exp $");
+__RCSID("$NetBSD: io.c,v 1.65 2021/09/25 22:54:32 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/io.c 334927 2018-06-10 16:44:18Z pstef $");
#endif
@@ -466,7 +466,7 @@ diag(int level, const char *msg, ...)
const char *s, *e;
if (level != 0)
- found_err = 1;
+ found_err = true;
if (output == stdout) {
s = "/**INDENT** ";
