Module Name: src
Committed By: rillig
Date: Sat Jun 24 07:15:08 UTC 2023
Modified Files:
src/usr.bin/xlint/common: externs.h
src/usr.bin/xlint/lint1: externs1.h
Log Message:
lint: remove redundant 'extern' from function declarations
No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/xlint/common/externs.h
cvs rdiff -u -r1.177 -r1.178 src/usr.bin/xlint/lint1/externs1.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/xlint/common/externs.h
diff -u src/usr.bin/xlint/common/externs.h:1.25 src/usr.bin/xlint/common/externs.h:1.26
--- src/usr.bin/xlint/common/externs.h:1.25 Fri Jan 13 19:41:50 2023
+++ src/usr.bin/xlint/common/externs.h Sat Jun 24 07:15:08 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: externs.h,v 1.25 2023/01/13 19:41:50 rillig Exp $ */
+/* $NetBSD: externs.h,v 1.26 2023/06/24 07:15:08 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -34,33 +34,33 @@
/*
* inittyp.c
*/
-extern void inittyp(void);
+void inittyp(void);
/*
* tyname.c
*/
-extern const char *type_name(const type_t *);
-extern const char *tspec_name(tspec_t);
+const char *type_name(const type_t *);
+const char *tspec_name(tspec_t);
/*
* mem.c
*/
-extern void *xmalloc(size_t);
-extern void *xcalloc(size_t, size_t);
-extern void *xrealloc(void *, size_t);
-extern char *xstrdup(const char *);
-extern char *xasprintf(const char *, ...) __printflike(1, 2);
+void *xmalloc(size_t);
+void *xcalloc(size_t, size_t);
+void *xrealloc(void *, size_t);
+char *xstrdup(const char *);
+char *xasprintf(const char *, ...) __printflike(1, 2);
/*
* emit.c
*/
#if defined(IS_LINT1) || defined(IS_LINT2)
-extern void outopen(const char *);
-extern void outclose(void);
-extern void outclr(void);
-extern void outchar(char);
-extern void outstrg(const char *);
-extern void outint(int);
-extern void outname(const char *);
-extern void outsrc(const char *);
+void outopen(const char *);
+void outclose(void);
+void outclr(void);
+void outchar(char);
+void outstrg(const char *);
+void outint(int);
+void outname(const char *);
+void outsrc(const char *);
#endif
Index: src/usr.bin/xlint/lint1/externs1.h
diff -u src/usr.bin/xlint/lint1/externs1.h:1.177 src/usr.bin/xlint/lint1/externs1.h:1.178
--- src/usr.bin/xlint/lint1/externs1.h:1.177 Sun Apr 23 09:04:44 2023
+++ src/usr.bin/xlint/lint1/externs1.h Sat Jun 24 07:15:08 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: externs1.h,v 1.177 2023/04/23 09:04:44 rillig Exp $ */
+/* $NetBSD: externs1.h,v 1.178 2023/06/24 07:15:08 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -60,7 +60,7 @@ extern bool allow_gcc;
extern sig_atomic_t fpe;
-extern void norecover(void);
+void norecover(void);
/*
* cgram.y
@@ -69,8 +69,8 @@ extern int block_level;
extern size_t mem_block_level;
extern int yydebug;
-extern int yyerror(const char *);
-extern int yyparse(void);
+int yyerror(const char *);
+int yyparse(void);
/*
* scan.l
@@ -82,36 +82,36 @@ extern bool in_system_header;
extern symt_t symtyp;
extern FILE *yyin;
-extern void initscan(void);
-extern int64_t convert_integer(int64_t, tspec_t, unsigned int);
-extern void clear_warn_flags(void);
-extern sym_t *getsym(sbuf_t *);
-extern void clean_up_after_error(void);
-extern sym_t *pushdown(const sym_t *);
-extern sym_t *mktempsym(type_t *);
-extern void rmsym(sym_t *);
-extern void rmsyms(sym_t *);
-extern void inssym(int, sym_t *);
-extern void freeyyv(void *, int);
-extern int yylex(void);
+void initscan(void);
+int64_t convert_integer(int64_t, tspec_t, unsigned int);
+void clear_warn_flags(void);
+sym_t *getsym(sbuf_t *);
+void clean_up_after_error(void);
+sym_t *pushdown(const sym_t *);
+sym_t *mktempsym(type_t *);
+void rmsym(sym_t *);
+void rmsyms(sym_t *);
+void inssym(int, sym_t *);
+void freeyyv(void *, int);
+int yylex(void);
/*
* mem1.c
*/
-extern const char *record_filename(const char *, size_t);
-extern int get_filename_id(const char *);
-extern void add_directory_replacement(char *);
-extern const char *transform_filename(const char *, size_t);
-
-extern void *block_zero_alloc(size_t);
-extern void *level_zero_alloc(size_t, size_t);
-extern void level_free_all(size_t);
-
-extern void *expr_zero_alloc(size_t);
-extern tnode_t *expr_alloc_tnode(void);
-extern void expr_free_all(void);
-extern memory_pool expr_save_memory(void);
-extern void expr_restore_memory(memory_pool);
+const char *record_filename(const char *, size_t);
+int get_filename_id(const char *);
+void add_directory_replacement(char *);
+const char *transform_filename(const char *, size_t);
+
+void *block_zero_alloc(size_t);
+void *level_zero_alloc(size_t, size_t);
+void level_free_all(size_t);
+
+void *expr_zero_alloc(size_t);
+tnode_t *expr_alloc_tnode(void);
+void expr_free_all(void);
+memory_pool expr_save_memory(void);
+void expr_restore_memory(memory_pool);
/*
* debug.c
@@ -159,22 +159,22 @@ extern int nerr;
extern int sytxerr;
extern bool any_query_enabled;
-extern void msglist(void);
-extern void error_at(int, const pos_t *, ...);
-extern void warning_at(int, const pos_t *, ...);
-extern void message_at(int, const pos_t *, ...);
-extern void error(int, ...);
-extern void warning(int, ...);
-extern bool gnuism(int, ...);
-extern void c99ism(int, ...);
-extern void c11ism(int, ...);
-extern void assert_failed(const char *, int, const char *, const char *)
+void msglist(void);
+void error_at(int, const pos_t *, ...);
+void warning_at(int, const pos_t *, ...);
+void message_at(int, const pos_t *, ...);
+void error(int, ...);
+void warning(int, ...);
+bool gnuism(int, ...);
+void c99ism(int, ...);
+void c11ism(int, ...);
+void assert_failed(const char *, int, const char *, const char *)
__attribute__((__noreturn__));
-extern void update_location(const char *, int, bool, bool);
-extern void suppress_messages(const char *);
+void update_location(const char *, int, bool, bool);
+void suppress_messages(const char *);
-extern void query_message(int, ...);
-extern void enable_queries(const char *);
+void query_message(int, ...);
+void enable_queries(const char *);
/*
* decl.c
@@ -183,100 +183,97 @@ extern dinfo_t *dcs;
extern const char unnamed[];
extern int enumval;
-extern void initdecl(void);
-extern type_t *gettyp(tspec_t);
-extern type_t *block_dup_type(const type_t *);
-extern type_t *expr_dup_type(const type_t *);
-extern type_t *expr_unqualified_type(const type_t *);
-extern bool is_incomplete(const type_t *);
-extern void dcs_add_storage_class(scl_t);
-extern void dcs_add_type(type_t *);
-extern void dcs_add_qualifier(tqual_t);
-extern void dcs_add_packed(void);
-extern void dcs_set_used(void);
-extern void begin_declaration_level(declaration_kind);
-extern void end_declaration_level(void);
-extern void dcs_set_asm(void);
-extern void dcs_begin_type(void);
-extern void dcs_end_type(void);
-extern int length_in_bits(const type_t *, const char *);
-extern unsigned int alignment_in_bits(const type_t *);
-extern sym_t *concat_lists(sym_t *, sym_t *);
-extern void check_type(sym_t *);
-extern sym_t *declarator_1_struct_union(sym_t *);
-extern sym_t *set_bit_field_width(sym_t *, int);
-extern qual_ptr *merge_qualified_pointer(qual_ptr *, qual_ptr *);
-extern sym_t *add_pointer(sym_t *, qual_ptr *);
-extern sym_t *add_array(sym_t *, bool, int);
-extern sym_t *add_function(sym_t *, sym_t *);
-extern void check_function_definition(sym_t *, bool);
-extern sym_t *declarator_name(sym_t *);
-extern sym_t *old_style_function_name(sym_t *);
-extern type_t *make_tag_type(sym_t *, tspec_t, bool, bool);
-extern const char *storage_class_name(scl_t);
-extern type_t *complete_tag_struct_or_union(type_t *, sym_t *);
-extern type_t *complete_tag_enum(type_t *, sym_t *);
-extern sym_t *enumeration_constant(sym_t *, int, bool);
-extern void declare(sym_t *, bool, sbuf_t *);
-extern void copy_usage_info(sym_t *, sym_t *);
-extern bool check_redeclaration(sym_t *, bool *);
-extern bool pointer_types_are_compatible(const type_t *, const type_t *,
- bool);
-extern bool types_compatible(const type_t *, const type_t *,
- bool, bool, bool *);
-extern void complete_type(sym_t *, sym_t *);
-extern sym_t *declare_argument(sym_t *, bool);
-extern void check_func_lint_directives(void);
-extern void check_func_old_style_arguments(void);
-
-extern void declare_local(sym_t *, bool);
-extern sym_t *abstract_name(void);
-extern void global_clean_up(void);
-extern sym_t *declare_1_abstract(sym_t *);
-extern void check_size(sym_t *);
-extern void mark_as_set(sym_t *);
-extern void mark_as_used(sym_t *, bool, bool);
-extern void check_usage(dinfo_t *);
-extern void check_usage_sym(bool, sym_t *);
-extern void check_global_symbols(void);
-extern void print_previous_declaration(const sym_t *);
-extern int to_int_constant(tnode_t *, bool);
+void initdecl(void);
+type_t *gettyp(tspec_t);
+type_t *block_dup_type(const type_t *);
+type_t *expr_dup_type(const type_t *);
+type_t *expr_unqualified_type(const type_t *);
+bool is_incomplete(const type_t *);
+void dcs_add_storage_class(scl_t);
+void dcs_add_type(type_t *);
+void dcs_add_qualifier(tqual_t);
+void dcs_add_packed(void);
+void dcs_set_used(void);
+void begin_declaration_level(declaration_kind);
+void end_declaration_level(void);
+void dcs_set_asm(void);
+void dcs_begin_type(void);
+void dcs_end_type(void);
+int length_in_bits(const type_t *, const char *);
+unsigned int alignment_in_bits(const type_t *);
+sym_t *concat_lists(sym_t *, sym_t *);
+void check_type(sym_t *);
+sym_t *declarator_1_struct_union(sym_t *);
+sym_t *set_bit_field_width(sym_t *, int);
+qual_ptr *merge_qualified_pointer(qual_ptr *, qual_ptr *);
+sym_t *add_pointer(sym_t *, qual_ptr *);
+sym_t *add_array(sym_t *, bool, int);
+sym_t *add_function(sym_t *, sym_t *);
+void check_function_definition(sym_t *, bool);
+sym_t *declarator_name(sym_t *);
+sym_t *old_style_function_name(sym_t *);
+type_t *make_tag_type(sym_t *, tspec_t, bool, bool);
+const char *storage_class_name(scl_t);
+type_t *complete_tag_struct_or_union(type_t *, sym_t *);
+type_t *complete_tag_enum(type_t *, sym_t *);
+sym_t *enumeration_constant(sym_t *, int, bool);
+void declare(sym_t *, bool, sbuf_t *);
+void copy_usage_info(sym_t *, sym_t *);
+bool check_redeclaration(sym_t *, bool *);
+bool pointer_types_are_compatible(const type_t *, const type_t *, bool);
+bool types_compatible(const type_t *, const type_t *, bool, bool, bool *);
+void complete_type(sym_t *, sym_t *);
+sym_t *declare_argument(sym_t *, bool);
+void check_func_lint_directives(void);
+void check_func_old_style_arguments(void);
+
+void declare_local(sym_t *, bool);
+sym_t *abstract_name(void);
+void global_clean_up(void);
+sym_t *declare_1_abstract(sym_t *);
+void check_size(sym_t *);
+void mark_as_set(sym_t *);
+void mark_as_used(sym_t *, bool, bool);
+void check_usage(dinfo_t *);
+void check_usage_sym(bool, sym_t *);
+void check_global_symbols(void);
+void print_previous_declaration(const sym_t *);
+int to_int_constant(tnode_t *, bool);
/*
* tree.c
*/
-extern const tnode_t *before_conversion(const tnode_t *);
-extern type_t *block_derive_type(type_t *, tspec_t);
-extern type_t *expr_derive_type(type_t *, tspec_t);
-extern bool is_compiler_builtin(const char *);
-extern tnode_t *build_constant(type_t *, val_t *);
-extern tnode_t *build_name(sym_t *, bool);
-extern tnode_t *build_string(strg_t *);
-extern tnode_t *build_generic_selection(const tnode_t *,
+const tnode_t *before_conversion(const tnode_t *);
+type_t *block_derive_type(type_t *, tspec_t);
+type_t *expr_derive_type(type_t *, tspec_t);
+bool is_compiler_builtin(const char *);
+tnode_t *build_constant(type_t *, val_t *);
+tnode_t *build_name(sym_t *, bool);
+tnode_t *build_string(strg_t *);
+tnode_t *build_generic_selection(const tnode_t *,
struct generic_association *);
-extern tnode_t *build_binary(tnode_t *, op_t, bool, tnode_t *);
-extern tnode_t *build_unary(op_t, bool, tnode_t *);
-extern tnode_t *build_member_access(tnode_t *, op_t, bool, sbuf_t *);
-extern tnode_t *cconv(tnode_t *);
-extern bool is_typeok_bool_compares_with_zero(const tnode_t *);
-extern bool typeok(op_t, int, const tnode_t *, const tnode_t *);
-extern tnode_t *promote(op_t, bool, tnode_t *);
-extern tnode_t *convert(op_t, int, type_t *, tnode_t *);
-extern void convert_constant(op_t, int, const type_t *, val_t *, val_t *);
-extern tnode_t *build_sizeof(const type_t *);
-extern tnode_t *build_offsetof(const type_t *, const sym_t *);
-extern tnode_t *build_alignof(const type_t *);
-extern tnode_t *cast(tnode_t *, type_t *);
-extern tnode_t *build_function_argument(tnode_t *, tnode_t *);
-extern tnode_t *build_function_call(tnode_t *, bool, tnode_t *);
-extern val_t *constant(tnode_t *, bool);
-extern void expr(tnode_t *, bool, bool, bool, bool);
-extern void check_expr_misc(const tnode_t *, bool, bool, bool,
- bool, bool, bool);
-extern bool constant_addr(const tnode_t *, const sym_t **, ptrdiff_t *);
-extern strg_t *cat_strings(strg_t *, strg_t *);
-extern unsigned int type_size_in_bits(const type_t *);
+tnode_t *build_binary(tnode_t *, op_t, bool, tnode_t *);
+tnode_t *build_unary(op_t, bool, tnode_t *);
+tnode_t *build_member_access(tnode_t *, op_t, bool, sbuf_t *);
+tnode_t *cconv(tnode_t *);
+bool is_typeok_bool_compares_with_zero(const tnode_t *);
+bool typeok(op_t, int, const tnode_t *, const tnode_t *);
+tnode_t *promote(op_t, bool, tnode_t *);
+tnode_t *convert(op_t, int, type_t *, tnode_t *);
+void convert_constant(op_t, int, const type_t *, val_t *, val_t *);
+tnode_t *build_sizeof(const type_t *);
+tnode_t *build_offsetof(const type_t *, const sym_t *);
+tnode_t *build_alignof(const type_t *);
+tnode_t *cast(tnode_t *, type_t *);
+tnode_t *build_function_argument(tnode_t *, tnode_t *);
+tnode_t *build_function_call(tnode_t *, bool, tnode_t *);
+val_t *constant(tnode_t *, bool);
+void expr(tnode_t *, bool, bool, bool, bool);
+void check_expr_misc(const tnode_t *, bool, bool, bool, bool, bool, bool);
+bool constant_addr(const tnode_t *, const sym_t **, ptrdiff_t *);
+strg_t *cat_strings(strg_t *, strg_t *);
+unsigned int type_size_in_bits(const type_t *);
void begin_statement_expr(void);
void do_statement_expr(tnode_t *);
@@ -304,103 +301,102 @@ extern bool bitfieldtype_ok;
extern bool plibflg;
extern bool quadflg;
-extern void begin_control_statement(control_statement_kind);
-extern void end_control_statement(control_statement_kind);
-extern void check_statement_reachable(void);
-extern void begin_function(sym_t *);
-extern void end_function(void);
-extern void named_label(sym_t *);
-extern void case_label(tnode_t *);
-extern void default_label(void);
-extern void if1(tnode_t *);
-extern void if2(void);
-extern void if3(bool);
-extern void switch1(tnode_t *);
-extern void switch2(void);
-extern void while1(tnode_t *);
-extern void while2(void);
-extern void do1(void);
-extern void do2(tnode_t *);
-extern void for1(tnode_t *, tnode_t *, tnode_t *);
-extern void for2(void);
-extern void do_goto(sym_t *);
-extern void do_continue(void);
-extern void do_break(void);
-extern void do_return(bool, tnode_t *);
-extern void global_clean_up_decl(bool);
-extern void argsused(int);
-extern void constcond(int);
-extern void fallthru(int);
-extern void not_reached(int);
-extern void lintlib(int);
-extern void linted(int);
-extern void varargs(int);
-extern void printflike(int);
-extern void scanflike(int);
-extern void protolib(int);
-extern void longlong(int);
-extern void bitfieldtype(int);
+void begin_control_statement(control_statement_kind);
+void end_control_statement(control_statement_kind);
+void check_statement_reachable(void);
+void begin_function(sym_t *);
+void end_function(void);
+void named_label(sym_t *);
+void case_label(tnode_t *);
+void default_label(void);
+void if1(tnode_t *);
+void if2(void);
+void if3(bool);
+void switch1(tnode_t *);
+void switch2(void);
+void while1(tnode_t *);
+void while2(void);
+void do1(void);
+void do2(tnode_t *);
+void for1(tnode_t *, tnode_t *, tnode_t *);
+void for2(void);
+void do_goto(sym_t *);
+void do_continue(void);
+void do_break(void);
+void do_return(bool, tnode_t *);
+void global_clean_up_decl(bool);
+void argsused(int);
+void constcond(int);
+void fallthru(int);
+void not_reached(int);
+void lintlib(int);
+void linted(int);
+void varargs(int);
+void printflike(int);
+void scanflike(int);
+void protolib(int);
+void longlong(int);
+void bitfieldtype(int);
/*
* init.c
*/
-extern void begin_initialization(sym_t *);
-extern void end_initialization(void);
-extern sym_t *current_initsym(void);
-
-extern void init_rbrace(void);
-extern void init_lbrace(void);
-extern void init_expr(tnode_t *);
-extern void begin_designation(void);
-extern void add_designator_member(sbuf_t *);
-extern void add_designator_subscript(range_t);
+void begin_initialization(sym_t *);
+void end_initialization(void);
+sym_t *current_initsym(void);
+
+void init_rbrace(void);
+void init_lbrace(void);
+void init_expr(tnode_t *);
+void begin_designation(void);
+void add_designator_member(sbuf_t *);
+void add_designator_subscript(range_t);
/*
* emit.c
*/
-extern void outtype(const type_t *);
-extern void outsym(const sym_t *, scl_t, def_t);
-extern void outfdef(const sym_t *, const pos_t *, bool, bool,
- const sym_t *);
-extern void outcall(const tnode_t *, bool, bool);
-extern void outusg(const sym_t *);
+void outtype(const type_t *);
+void outsym(const sym_t *, scl_t, def_t);
+void outfdef(const sym_t *, const pos_t *, bool, bool, const sym_t *);
+void outcall(const tnode_t *, bool, bool);
+void outusg(const sym_t *);
/*
* lex.c
*/
-extern int lex_name(const char *, size_t);
-extern int lex_integer_constant(const char *, size_t, int);
-extern int lex_floating_constant(const char *, size_t);
-extern int lex_operator(int, op_t);
-extern int lex_string(void);
-extern int lex_wide_string(void);
-extern int lex_character_constant(void);
-extern int lex_wide_character_constant(void);
-extern void lex_directive(const char *);
-extern void lex_next_line(void);
-extern void lex_comment(void);
-extern void lex_slash_slash_comment(void);
-extern void lex_unknown_character(int);
-extern int lex_input(void);
+int lex_name(const char *, size_t);
+int lex_integer_constant(const char *, size_t, int);
+int lex_floating_constant(const char *, size_t);
+int lex_operator(int, op_t);
+int lex_string(void);
+int lex_wide_string(void);
+int lex_character_constant(void);
+int lex_wide_character_constant(void);
+void lex_directive(const char *);
+void lex_next_line(void);
+void lex_comment(void);
+void lex_slash_slash_comment(void);
+void lex_unknown_character(int);
+int lex_input(void);
/*
* ckbool.c
*/
-extern bool typeok_scalar_strict_bool(op_t, const mod_t *, int,
+bool typeok_scalar_strict_bool(op_t, const mod_t *, int,
const tnode_t *, const tnode_t *);
-extern bool fallback_symbol_strict_bool(sym_t *);
+bool fallback_symbol_strict_bool(sym_t *);
/*
* ckctype.c
*/
-extern void check_ctype_function_call(const tnode_t *, const tnode_t *);
-extern void check_ctype_macro_invocation(const tnode_t *, const tnode_t *);
+void check_ctype_function_call(const tnode_t *, const tnode_t *);
+void check_ctype_macro_invocation(const tnode_t *, const tnode_t *);
/*
* ckgetopt.c
*/
-extern void check_getopt_begin_while(const tnode_t *);
-extern void check_getopt_begin_switch(void);
-extern void check_getopt_case_label(int64_t);
-extern void check_getopt_end_switch(void);
-extern void check_getopt_end_while(void);
+void check_getopt_begin_while(const tnode_t *);
+void check_getopt_begin_switch(void);
+void check_getopt_case_label(int64_t);
+void check_getopt_end_switch(void);
+void check_getopt_end_while(void);
