From e6396f02a536fb015a2b557c1dabc00d8cad8a62 Mon Sep 17 00:00:00 2001 From: David Given Date: Sun, 30 Oct 2016 16:31:08 +0100 Subject: [PATCH] Remove a bunch of bogus extern declarations for things like strcpy(). --- fast/driver/driver.c | 2 -- fcc/driver/fcc.c | 2 -- lang/basic/src/bem.h | 4 ---- lang/cem/cemcom.ansi/replace.c | 1 - lang/cem/cemcom/init.c | 2 -- lang/cem/cemcom/replace.c | 1 - lang/cem/cpp.ansi/LLlex.c | 1 - lang/cem/cpp.ansi/init.c | 1 - lang/cem/cpp.ansi/replace.c | 2 -- lang/cem/libcc/gen/ttyname.c | 2 -- lang/cem/lint/lpass2/checkargs.c | 2 -- lang/cem/lint/lpass2/lpass2.c | 2 -- lang/m2/m2mm/main.c | 2 -- lang/occam/comp/occam.g | 2 +- mach/proto/cg/compute.c | 2 +- modules/src/em_code/em.c | 1 - modules/src/em_code/insert.c | 2 -- modules/src/em_opt/outputdfa.c | 1 - modules/src/system/lock.c | 1 - util/LLgen/src/machdep.c | 1 - util/LLgen/src/tokens.c | 2 -- util/LLgen/src/tokens.g | 2 -- util/ass/assex.h | 12 ------------ util/byacc/defs.h | 14 -------------- util/cmisc/cclash.c | 2 -- util/cmisc/cid.c | 2 -- util/cmisc/mkdep.c | 1 - util/cmisc/prid.c | 2 -- util/cpp/LLlex.c | 1 - util/cpp/init.c | 2 -- util/cpp/replace.c | 1 - util/ego/em_ego/em_ego.c | 4 ---- util/ego/ic/ic_lookup.c | 2 -- util/grind/commands.g | 2 -- util/grind/expr.c | 1 - util/grind/rd.c | 2 -- util/int/log.c | 3 --- util/int/main.c | 4 ---- 38 files changed, 2 insertions(+), 91 deletions(-) diff --git a/fast/driver/driver.c b/fast/driver/driver.c index 3f4388909..ff9a6faae 100644 --- a/fast/driver/driver.c +++ b/fast/driver/driver.c @@ -198,8 +198,6 @@ USTRING tmp_file; int noexec = 0; -extern char *strcat(), *strcpy(), *mktemp(), *strchr(); - trapcc(sig) int sig; { diff --git a/fcc/driver/fcc.c b/fcc/driver/fcc.c index 101fa3fce..385ef1d59 100644 --- a/fcc/driver/fcc.c +++ b/fcc/driver/fcc.c @@ -138,8 +138,6 @@ USTRING tmp_file; int noexec = 0; -extern char *strcat(), *strcpy(), *mktemp(), *strchr(); - trapcc(sig) int sig; { diff --git a/lang/basic/src/bem.h b/lang/basic/src/bem.h index deb6eb435..273c06299 100644 --- a/lang/basic/src/bem.h +++ b/lang/basic/src/bem.h @@ -71,13 +71,9 @@ extern int dataused; extern Linerecord *currline; -extern char *itoa(); extern char *salloc(); -extern char *strcpy(); -extern char *strcat(); #if __STDC__ #include #else -extern char *malloc(); #endif diff --git a/lang/cem/cemcom.ansi/replace.c b/lang/cem/cemcom.ansi/replace.c index cde3aaf43..7585d48fa 100644 --- a/lang/cem/cemcom.ansi/replace.c +++ b/lang/cem/cemcom.ansi/replace.c @@ -24,7 +24,6 @@ extern struct idf *GetIdentifier(); extern int InputLevel; struct repl *ReplaceList; /* list of currently active macros */ -extern char *strcat(), *strcpy(); int replace(idf) diff --git a/lang/cem/cemcom/init.c b/lang/cem/cemcom/init.c index b7c855343..1abd5d8dd 100644 --- a/lang/cem/cemcom/init.c +++ b/lang/cem/cemcom/init.c @@ -33,8 +33,6 @@ PRIVATE struct mkey { {0, K_UNKNOWN} }; -char *strcpy(); - EXPORT init_pp() { diff --git a/lang/cem/cemcom/replace.c b/lang/cem/cemcom/replace.c index 758d14df8..9f98818a8 100644 --- a/lang/cem/cemcom/replace.c +++ b/lang/cem/cemcom/replace.c @@ -25,7 +25,6 @@ #include "interface.h" #include "static.h" -char *strcpy(), *strcat(); char *long2str(); extern int InputLevel; diff --git a/lang/cem/cpp.ansi/LLlex.c b/lang/cem/cpp.ansi/LLlex.c index 3cd162898..84cc573ba 100644 --- a/lang/cem/cpp.ansi/LLlex.c +++ b/lang/cem/cpp.ansi/LLlex.c @@ -30,7 +30,6 @@ int LexSave = 0; /* last character read by GetChar */ extern int InputLevel; /* # of current macro expansions */ extern char *string_token(); -extern char *strcpy(); extern arith char_constant(); #define FLG_ESEEN 0x01 /* possibly a floating point number */ #define FLG_DOTSEEN 0x02 /* certainly a floating point number */ diff --git a/lang/cem/cpp.ansi/init.c b/lang/cem/cpp.ansi/init.c index a9cba4dba..070c1babe 100644 --- a/lang/cem/cpp.ansi/init.c +++ b/lang/cem/cpp.ansi/init.c @@ -33,7 +33,6 @@ struct mkey { {0, K_UNKNOWN} }; -char *strcpy(); char *sprint(); init_pp() diff --git a/lang/cem/cpp.ansi/replace.c b/lang/cem/cpp.ansi/replace.c index 255902f68..d544dd35a 100644 --- a/lang/cem/cpp.ansi/replace.c +++ b/lang/cem/cpp.ansi/replace.c @@ -21,8 +21,6 @@ #include "replace.h" extern char *GetIdentifier(); -extern char *strcpy(); -extern char *strcat(); extern int InputLevel; struct repl *ReplaceList; /* list of currently active macros */ diff --git a/lang/cem/libcc/gen/ttyname.c b/lang/cem/libcc/gen/ttyname.c index ad991ac29..d8307afa8 100644 --- a/lang/cem/libcc/gen/ttyname.c +++ b/lang/cem/libcc/gen/ttyname.c @@ -5,8 +5,6 @@ #define DEV "/dev/" -extern char *strcpy(), *strcat(); - char * ttyname(filedes) { diff --git a/lang/cem/lint/lpass2/checkargs.c b/lang/cem/lint/lpass2/checkargs.c index 6e0c774fa..4f10f2584 100644 --- a/lang/cem/lint/lpass2/checkargs.c +++ b/lang/cem/lint/lpass2/checkargs.c @@ -9,8 +9,6 @@ #include "private.h" #include "inpdef.h" -extern char *strcpy(); - #define streq(s1,s2) (strcmp(s1, s2) == 0) /* a format is developed into a normal parameter definition */ diff --git a/lang/cem/lint/lpass2/lpass2.c b/lang/cem/lint/lpass2/lpass2.c index 6775f170b..500e5cb8f 100644 --- a/lang/cem/lint/lpass2/lpass2.c +++ b/lang/cem/lint/lpass2/lpass2.c @@ -12,8 +12,6 @@ #include "class.h" #include "inpdef.h" -extern char *strcpy(); - #define streq(s1,s2) (strcmp(s1, s2) == 0) PRIVATE char cur_name[NAMESIZE]; diff --git a/lang/m2/m2mm/main.c b/lang/m2/m2mm/main.c index 8b951a8b8..367cbb407 100644 --- a/lang/m2/m2mm/main.c +++ b/lang/m2/m2mm/main.c @@ -27,8 +27,6 @@ int nDEF, mDEF; struct file_list *CurrentArg; extern int err_occurred; extern int Roption; -extern char *strrchr(); -extern char *strcpy(), *strcat(); char * basename(s) diff --git a/lang/occam/comp/occam.g b/lang/occam/comp/occam.g index 3385cca32..97984b191 100644 --- a/lang/occam/comp/occam.g +++ b/lang/occam/comp/occam.g @@ -6,6 +6,7 @@ /* OCCAM */ { #include +#include #include "token.h" #include "symtab.h" #include "expr.h" @@ -18,7 +19,6 @@ static void nonconst(), nonpositive(), rep_cleanup(), check_assoc(); void init_builtins(); -char *strcpy(); extern int lineno, LLsymb; union type_info info, none; diff --git a/mach/proto/cg/compute.c b/mach/proto/cg/compute.c index 26570f49d..49d2381fa 100644 --- a/mach/proto/cg/compute.c +++ b/mach/proto/cg/compute.c @@ -73,7 +73,7 @@ char opdesc[] = { LLDEF, /* EX_REGVAR */ }; -string salloc(),strcpy(),strcat(); +string salloc(); string mycat(s1,s2) string s1,s2; { register string s; diff --git a/modules/src/em_code/em.c b/modules/src/em_code/em.c index f13ab28dc..cf6948bff 100644 --- a/modules/src/em_code/em.c +++ b/modules/src/em_code/em.c @@ -31,7 +31,6 @@ File *C_ofp; #ifndef INCORE File *C_tfr; char *C_tmpfile; -char *strcpy(), *strcat(); char *C_ibuf = 0; long C_current_out; #endif diff --git a/modules/src/em_code/insert.c b/modules/src/em_code/insert.c index f7526b8e4..bb71c839d 100644 --- a/modules/src/em_code/insert.c +++ b/modules/src/em_code/insert.c @@ -134,8 +134,6 @@ C_findpart(part) return p; } -extern char *strcpy(), *strcat(), *mktemp(); - static swttmp() { diff --git a/modules/src/em_opt/outputdfa.c b/modules/src/em_opt/outputdfa.c index cebdd958c..7eb81cf43 100644 --- a/modules/src/em_opt/outputdfa.c +++ b/modules/src/em_opt/outputdfa.c @@ -40,7 +40,6 @@ PRIVATE openofile(filename) char *filename; { - char *strcpy(), *strcat(); strcpy(ofilename,filename); strcpy(ofiletemp,filename); strcat(ofiletemp,".new"); diff --git a/modules/src/system/lock.c b/modules/src/system/lock.c index 0f6be5985..52d2f3864 100644 --- a/modules/src/system/lock.c +++ b/modules/src/system/lock.c @@ -12,7 +12,6 @@ sys_lock(path) { char buf[1024]; char *tmpf = ".lockXXXXXX"; - char *strrchr(), *strcpy(), *mktemp(); char *p; int ok, fd; diff --git a/util/LLgen/src/machdep.c b/util/LLgen/src/machdep.c index 780951495..7fddf8eb2 100644 --- a/util/LLgen/src/machdep.c +++ b/util/LLgen/src/machdep.c @@ -57,7 +57,6 @@ libpath(s) string s; { register string p; register length; p_mem alloc(); - string strcpy(), strcat(); char* libdir = getenv("LLGEN_LIB_DIR"); if (!libdir) diff --git a/util/LLgen/src/tokens.c b/util/LLgen/src/tokens.c index 8fa2b3613..09bd75ae0 100644 --- a/util/LLgen/src/tokens.c +++ b/util/LLgen/src/tokens.c @@ -577,8 +577,6 @@ cpy(s,p,inserted) register string p; { return p; } -string strcpy(); - LLmessage(d) { /* * d is either 0, in which case the current token has been deleted, diff --git a/util/LLgen/src/tokens.g b/util/LLgen/src/tokens.g index fbdd83d2d..ccc214bf6 100644 --- a/util/LLgen/src/tokens.g +++ b/util/LLgen/src/tokens.g @@ -547,8 +547,6 @@ cpy(s,p,inserted) register string p; { return p; } -string strcpy(); - LLmessage(d) { /* * d is either 0, in which case the current token has been deleted, diff --git a/util/ass/assex.h b/util/ass/assex.h index f28c6f582..d3a50ed17 100644 --- a/util/ass/assex.h +++ b/util/ass/assex.h @@ -150,16 +150,4 @@ extern relc_t *text_reloc(); extern relc_t *data_reloc(); extern area_t getarea(); -/* - * all used library routines - */ -extern char *malloc(); -extern int open(); -extern int creat(); -extern int getpid(); -extern int unlink(); -extern int close(); -extern int strcmp(); -extern char *strcpy(); - #define void int diff --git a/util/byacc/defs.h b/util/byacc/defs.h index 5eef5c55a..5d13945ad 100644 --- a/util/byacc/defs.h +++ b/util/byacc/defs.h @@ -269,17 +269,3 @@ extern short final_state; extern char *allocate(); extern bucket *lookup(); extern bucket *make_bucket(); - - -/* system variables */ - -extern int errno; - - -/* system functions */ - -extern void free(); -extern char *calloc(); -extern char *malloc(); -extern char *realloc(); -extern char *strcpy(); diff --git a/util/cmisc/cclash.c b/util/cmisc/cclash.c index 44fa6cbe6..89ad40c5c 100644 --- a/util/cmisc/cclash.c +++ b/util/cmisc/cclash.c @@ -184,8 +184,6 @@ char * Salloc(str) char *str; { - char *strcpy(); - if (str == 0) str = ""; diff --git a/util/cmisc/cid.c b/util/cmisc/cid.c index a21a4d940..f2f445719 100644 --- a/util/cmisc/cid.c +++ b/util/cmisc/cid.c @@ -159,8 +159,6 @@ char * Salloc(str) char *str; { - char *strcpy(); - if (str == 0) { str = ""; } diff --git a/util/cmisc/mkdep.c b/util/cmisc/mkdep.c index 8e14ae2dc..da14ff844 100644 --- a/util/cmisc/mkdep.c +++ b/util/cmisc/mkdep.c @@ -64,7 +64,6 @@ add_name(nm) char *nm; { struct namelist *nlp = nl, *lnlp = 0, *nnlp; - char *strcpy(); while (nlp) { register i = strcmp(nm, nlp->name); diff --git a/util/cmisc/prid.c b/util/cmisc/prid.c index e81efe59e..8221cfbc2 100644 --- a/util/cmisc/prid.c +++ b/util/cmisc/prid.c @@ -101,8 +101,6 @@ char * Salloc(str) char *str; { - char *strcpy(); - if (str == 0) str = ""; diff --git a/util/cpp/LLlex.c b/util/cpp/LLlex.c index 93602e9d9..498c4892e 100644 --- a/util/cpp/LLlex.c +++ b/util/cpp/LLlex.c @@ -26,7 +26,6 @@ int AccDefined = 0; /* accept "defined(...)" */ int UnknownIdIsZero = 0; /* interpret unknown id as integer 0 */ char *string_token(); -char *strcpy(); PushLex() { diff --git a/util/cpp/init.c b/util/cpp/init.c index 61e2ac809..44fc2d727 100644 --- a/util/cpp/init.c +++ b/util/cpp/init.c @@ -30,8 +30,6 @@ PRIVATE struct mkey { {0, K_UNKNOWN} }; -char *strcpy(); - EXPORT init_pp() { diff --git a/util/cpp/replace.c b/util/cpp/replace.c index 1951e1bda..2c3eec830 100644 --- a/util/cpp/replace.c +++ b/util/cpp/replace.c @@ -20,7 +20,6 @@ #include "class.h" #include "interface.h" -char *strcpy(), *strcat(); char *long2str(); extern int InputLevel; diff --git a/util/ego/em_ego/em_ego.c b/util/ego/em_ego/em_ego.c index e7bab272e..2c8717c82 100644 --- a/util/ego/em_ego/em_ego.c +++ b/util/ego/em_ego/em_ego.c @@ -59,10 +59,6 @@ static const struct #define MAXARGS 1024 /* mar # of args */ #define NTEMPS 4 /* # of temporary files; not tunable */ -extern char* mktemp(); -extern char* strcpy(), *strcat(); -extern char* strrchr(); - static char ddump[128] = TMP_DIR; /* data label dump file */ static char pdump[128] = TMP_DIR; /* procedure name dump file */ static char tmpbufs[NTEMPS * 2][128] = { diff --git a/util/ego/ic/ic_lookup.c b/util/ego/ic/ic_lookup.c index 8a7afa233..34c2391fa 100644 --- a/util/ego/ic/ic_lookup.c +++ b/util/ego/ic/ic_lookup.c @@ -26,8 +26,6 @@ prc_p prochash[NPROCHASH]; num_p numhash[NNUMHASH]; char *lastname; -extern char *strcpy(); - #define newsym() (sym_p) newstruct(sym) #define newprc() (prc_p) newstruct(prc) #define newnum() (num_p) newstruct(num) diff --git a/util/grind/commands.g b/util/grind/commands.g index eeb3332fa..9f8f759e0 100644 --- a/util/grind/commands.g +++ b/util/grind/commands.g @@ -19,8 +19,6 @@ #include "misc.h" extern char *Salloc(); -extern char *strchr(); -extern char *strcpy(); extern void signal_child(); extern FILE *db_in; extern int disable_intr; diff --git a/util/grind/expr.c b/util/grind/expr.c index 8b9409cf1..579515e0c 100644 --- a/util/grind/expr.c +++ b/util/grind/expr.c @@ -56,7 +56,6 @@ extern FILE *db_out; extern int stack_offset; -extern char *strcpy(); extern t_addr *get_EM_regs(); extern char *memcpy(); extern char *malloc(), *realloc(); diff --git a/util/grind/rd.c b/util/grind/rd.c index 13085b55b..07ba02eb1 100644 --- a/util/grind/rd.c +++ b/util/grind/rd.c @@ -205,8 +205,6 @@ rd_name(names, count) } } -extern char *strcpy(); - rd_string(strings, count) register char *strings; long count; diff --git a/util/int/log.c b/util/int/log.c index 517d90a88..70d1d299d 100644 --- a/util/int/log.c +++ b/util/int/log.c @@ -17,9 +17,6 @@ #ifdef LOGGING -extern int strlen(); -extern char *strcpy(); - extern long mess_id; /* from io.c */ extern FILE *fcreat_high(); /* from io.c */ diff --git a/util/int/main.c b/util/int/main.c index 3681d915f..59344765d 100644 --- a/util/int/main.c +++ b/util/int/main.c @@ -20,10 +20,6 @@ #include "opcode.h" #include "rsb.h" -extern int atoi(); -extern long atol(); -extern char *strcpy(); - char mess_file[64] = "int.mess"; /* name of message file */ jmp_buf trapbuf; -- 2.34.1