Module Name: src
Committed By: joerg
Date: Thu Apr 23 00:17:34 UTC 2020
Modified Files:
src/usr.bin/indent: indent.c indent_globs.h
Log Message:
Avoid common symbol declarations
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/indent/indent.c
cvs rdiff -u -r1.11 -r1.12 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/indent.c
diff -u src/usr.bin/indent/indent.c:1.26 src/usr.bin/indent/indent.c:1.27
--- src/usr.bin/indent/indent.c:1.26 Sat Oct 19 15:44:31 2019
+++ src/usr.bin/indent/indent.c Thu Apr 23 00:17:34 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: indent.c,v 1.26 2019/10/19 15:44:31 christos Exp $ */
+/* $NetBSD: indent.c,v 1.27 2020/04/23 00:17:34 joerg Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)indent.c 5.1
#include <sys/cdefs.h>
#ifndef lint
#if defined(__NetBSD__)
-__RCSID("$NetBSD: indent.c,v 1.26 2019/10/19 15:44:31 christos Exp $");
+__RCSID("$NetBSD: indent.c,v 1.27 2020/04/23 00:17:34 joerg Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/indent.c 340138 2018-11-04 19:24:49Z oshogbo $");
#endif
@@ -69,6 +69,60 @@ __FBSDID("$FreeBSD: head/usr.bin/indent/
#include "indent_codes.h"
#include "indent.h"
+struct options opt;
+struct parser_state ps;
+
+char *labbuf;
+char *s_lab;
+char *e_lab;
+char *l_lab;
+
+char *codebuf;
+char *s_code;
+char *e_code;
+char *l_code;
+
+char *combuf;
+char *s_com;
+char *e_com;
+char *l_com;
+
+char *tokenbuf;
+char *s_token;
+char *e_token;
+char *l_token;
+
+char *in_buffer;
+char *in_buffer_limit;
+char *buf_ptr;
+char *buf_end;
+
+char sc_buf[sc_size];
+char *save_com;
+char *sc_end;
+
+char *bp_save;
+char *be_save;
+
+int found_err;
+int n_real_blanklines;
+int prefix_blankline_requested;
+int postfix_blankline_requested;
+int break_comma;
+float case_ind;
+int code_lines;
+int had_eof;
+int line_no;
+int inhibit_formatting;
+int suppress_blanklines;
+
+int ifdef_level;
+struct parser_state state_stack[5];
+struct parser_state match_state[5];
+
+FILE *input;
+FILE *output;
+
static void bakcopy(void);
static void indent_declaration(int, int);
Index: src/usr.bin/indent/indent_globs.h
diff -u src/usr.bin/indent/indent_globs.h:1.11 src/usr.bin/indent/indent_globs.h:1.12
--- src/usr.bin/indent/indent_globs.h:1.11 Thu Apr 4 15:22:13 2019
+++ src/usr.bin/indent/indent_globs.h Thu Apr 23 00:17:34 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: indent_globs.h,v 1.11 2019/04/04 15:22:13 kamil Exp $ */
+/* $NetBSD: indent_globs.h,v 1.12 2020/04/23 00:17:34 joerg Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -51,8 +51,8 @@
#define true 1
-FILE *input; /* the fid for the input file */
-FILE *output; /* the output file */
+extern FILE *input; /* the fid for the input file */
+extern FILE *output; /* the output file */
#define CHECK_SIZE_CODE(desired_size) \
if (e_code + (desired_size) >= l_code) { \
@@ -106,44 +106,44 @@ FILE *output; /* the output file
s_token = tokenbuf + 1; \
}
-char *labbuf; /* buffer for label */
-char *s_lab; /* start ... */
-char *e_lab; /* .. and end of stored label */
-char *l_lab; /* limit of label buffer */
-
-char *codebuf; /* buffer for code section */
-char *s_code; /* start ... */
-char *e_code; /* .. and end of stored code */
-char *l_code; /* limit of code section */
-
-char *combuf; /* buffer for comments */
-char *s_com; /* start ... */
-char *e_com; /* ... and end of stored comments */
-char *l_com; /* limit of comment buffer */
+extern char *labbuf; /* buffer for label */
+extern char *s_lab; /* start ... */
+extern char *e_lab; /* .. and end of stored label */
+extern char *l_lab; /* limit of label buffer */
+
+extern char *codebuf; /* buffer for code section */
+extern char *s_code; /* start ... */
+extern char *e_code; /* .. and end of stored code */
+extern char *l_code; /* limit of code section */
+
+extern char *combuf; /* buffer for comments */
+extern char *s_com; /* start ... */
+extern char *e_com; /* ... and end of stored comments */
+extern char *l_com; /* limit of comment buffer */
#define token s_token
-char *tokenbuf; /* the last token scanned */
-char *s_token;
-char *e_token;
-char *l_token;
-
-char *in_buffer; /* input buffer */
-char *in_buffer_limit; /* the end of the input buffer */
-char *buf_ptr; /* ptr to next character to be taken from
+extern char *tokenbuf; /* the last token scanned */
+extern char *s_token;
+extern char *e_token;
+extern char *l_token;
+
+extern char *in_buffer; /* input buffer */
+extern char *in_buffer_limit; /* the end of the input buffer */
+extern char *buf_ptr; /* ptr to next character to be taken from
* in_buffer */
-char *buf_end; /* ptr to first after last char in in_buffer */
+extern char *buf_end; /* ptr to first after last char in in_buffer */
-char sc_buf[sc_size]; /* input text is saved here when looking for
+extern char sc_buf[sc_size]; /* input text is saved here when looking for
* the brace after an if, while, etc */
-char *save_com; /* start of the comment stored in sc_buf */
-char *sc_end; /* pointer into save_com buffer */
+extern char *save_com; /* start of the comment stored in sc_buf */
+extern char *sc_end; /* pointer into save_com buffer */
-char *bp_save; /* saved value of buf_ptr when taking input
+extern char *bp_save; /* saved value of buf_ptr when taking input
* from save_com */
-char *be_save; /* similarly saved value of buf_end */
+extern char *be_save; /* similarly saved value of buf_end */
-struct options {
+extern struct options {
int blanklines_around_conditional_compilation;
int blanklines_after_declarations_at_proctop; /* this is vaguely
* similar to blanklines_after_decla except
@@ -221,24 +221,24 @@ struct options {
* are printed */
} opt;
-int found_err;
-int n_real_blanklines;
-int prefix_blankline_requested;
-int postfix_blankline_requested;
-int break_comma; /* when true and not in parens, break after a
+extern int found_err;
+extern int n_real_blanklines;
+extern int prefix_blankline_requested;
+extern int postfix_blankline_requested;
+extern int break_comma; /* when true and not in parens, break after a
* comma */
-float case_ind; /* indentation level to be used for a "case
+extern float case_ind; /* indentation level to be used for a "case
* n:" */
-int code_lines; /* count of lines with code */
-int had_eof; /* set to true when input is exhausted */
-int line_no; /* the current line number. */
-int inhibit_formatting; /* true if INDENT OFF is in effect */
-int suppress_blanklines;/* set iff following blanklines should be
+extern int code_lines; /* count of lines with code */
+extern int had_eof; /* set to true when input is exhausted */
+extern int line_no; /* the current line number. */
+extern int inhibit_formatting; /* true if INDENT OFF is in effect */
+extern int suppress_blanklines;/* set iff following blanklines should be
* suppressed */
#define STACKSIZE 256
-struct parser_state {
+extern struct parser_state {
int last_token;
int p_stack[STACKSIZE]; /* this is the parsers stack */
int il[STACKSIZE]; /* this stack stores indentation levels */
@@ -316,6 +316,6 @@ struct parser_state {
int just_saw_decl;
} ps;
-int ifdef_level;
-struct parser_state state_stack[5];
-struct parser_state match_state[5];
+extern int ifdef_level;
+extern struct parser_state state_stack[5];
+extern struct parser_state match_state[5];
