Module Name: src
Committed By: rillig
Date: Fri Nov 19 18:25:50 UTC 2021
Modified Files:
src/usr.bin/indent: indent.h io.c
Log Message:
indent: unexport inbuf
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/usr.bin/indent/indent.h
cvs rdiff -u -r1.123 -r1.124 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.h
diff -u src/usr.bin/indent/indent.h:1.95 src/usr.bin/indent/indent.h:1.96
--- src/usr.bin/indent/indent.h:1.95 Fri Nov 19 18:23:59 2021
+++ src/usr.bin/indent/indent.h Fri Nov 19 18:25:50 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: indent.h,v 1.95 2021/11/19 18:23:59 rillig Exp $ */
+/* $NetBSD: indent.h,v 1.96 2021/11/19 18:25:50 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
@@ -143,20 +143,6 @@ struct buffer {
char *l; /* end of the allocated memory */
};
-extern struct input_buffer {
- struct buffer inp; /* one line of input, ready to be split into
- * tokens; occasionally this buffer switches
- * to save_com_buf */
- char save_com_buf[5000]; /* input text is saved here when looking for
- * the brace after an if, while, etc */
- char *save_com_s; /* start of the comment in save_com_buf */
- char *save_com_e; /* end of the comment in save_com_buf */
-
- char *saved_inp_s; /* saved value of inp.s when taking input from
- * save_com */
- char *saved_inp_e; /* similarly saved value of inp.e */
-} inbuf;
-
extern FILE *input;
extern FILE *output;
Index: src/usr.bin/indent/io.c
diff -u src/usr.bin/indent/io.c:1.123 src/usr.bin/indent/io.c:1.124
--- src/usr.bin/indent/io.c:1.123 Fri Nov 19 18:23:59 2021
+++ src/usr.bin/indent/io.c Fri Nov 19 18:25:50 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: io.c,v 1.123 2021/11/19 18:23:59 rillig Exp $ */
+/* $NetBSD: io.c,v 1.124 2021/11/19 18:25:50 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.123 2021/11/19 18:23:59 rillig Exp $");
+__RCSID("$NetBSD: io.c,v 1.124 2021/11/19 18:25:50 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/io.c 334927 2018-06-10 16:44:18Z pstef $");
#endif
@@ -57,7 +57,19 @@ __FBSDID("$FreeBSD: head/usr.bin/indent/
#include "indent.h"
-struct input_buffer inbuf;
+static struct input_buffer {
+ struct buffer inp; /* one line of input, ready to be split into
+ * tokens; occasionally this buffer switches
+ * to save_com_buf */
+ char save_com_buf[5000]; /* input text is saved here when looking for
+ * the brace after an if, while, etc */
+ char *save_com_s; /* start of the comment in save_com_buf */
+ char *save_com_e; /* end of the comment in save_com_buf */
+
+ char *saved_inp_s; /* saved value of inp.s when taking input from
+ * save_com */
+ char *saved_inp_e; /* similarly saved value of inp.e */
+} inbuf;
static int paren_indent;
static bool suppress_blanklines;
