From 2b6040818e35d57357226212c356ce370c5b5dd0 Mon Sep 17 00:00:00 2001 From: rsc Date: Sat, 7 May 2005 22:42:14 +0000 Subject: use full prototypes --- src/cmd/astro/dist.c | 8 ++++---- src/cmd/auth/ssh-agent.c | 6 +++--- src/cmd/join.c | 4 ++-- src/cmd/map/map.c | 2 +- src/cmd/mk/unix.c | 2 +- src/cmd/postscript/common/bbox.c | 2 +- src/cmd/postscript/common/misc.c | 1 - src/cmd/postscript/download/download.c | 16 ++++++++-------- src/cmd/sam/disk.c | 2 +- src/libhtml/lex.c | 2 +- src/libthread/thread.c | 2 +- 11 files changed, 23 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/cmd/astro/dist.c b/src/cmd/astro/dist.c index 3aec8752..91175a6f 100644 --- a/src/cmd/astro/dist.c +++ b/src/cmd/astro/dist.c @@ -192,7 +192,7 @@ event(char *format, char *arg1, char *arg2, double tim, int flag) p->flag = flag; } -int evcomp(); +int evcomp(const void*, const void*); void evflush(void) @@ -214,13 +214,13 @@ evflush(void) } int -evcomp(void *a1, void *a2) +evcomp(const void *a1, const void *a2) { double t1, t2; Event *p1, *p2; - p1 = a1; - p2 = a2; + p1 = (Event*)a1; + p2 = (Event*)a2; t1 = p1->tim; t2 = p2->tim; if(p1->flag & SIGNIF) diff --git a/src/cmd/auth/ssh-agent.c b/src/cmd/auth/ssh-agent.c index f8ded13d..beae7efe 100644 --- a/src/cmd/auth/ssh-agent.c +++ b/src/cmd/auth/ssh-agent.c @@ -950,7 +950,7 @@ runmsg(Aconn *a) ek = getmp(&m); mod = getmp(&m); chal = getmp(&m); - if((p = getn(&m, 16)) == nil){ + if((p = (char*)getn(&m, 16)) == nil){ Failchal: mpfree(ek); mpfree(mod); @@ -977,8 +977,8 @@ runmsg(Aconn *a) break; case SSH2_AGENTC_SIGN_REQUEST: - if(getm(&m, &mkey) < 0 - || getm(&m, &mdata) < 0) + if(getm(&m, &mkey) == nil + || getm(&m, &mdata) == nil) goto Failure; flags = get4(&m); if(flags & SSH_AGENT_OLD_SIGNATURE) diff --git a/src/cmd/join.c b/src/cmd/join.c index 7efff976..1739ef5d 100644 --- a/src/cmd/join.c +++ b/src/cmd/join.c @@ -165,7 +165,7 @@ Rune *strtorune(Rune *buf, char *s){ #define get1() n1=input(F1) #define get2() n2=input(F2) void -seek2() +seek2(void) { int n1, n2; int top2=0; @@ -208,7 +208,7 @@ seek2() } } void -seek1() +seek1(void) { int n1, n2; int top1=0; diff --git a/src/cmd/map/map.c b/src/cmd/map/map.c index 8d4dbfc2..74ae79ac 100644 --- a/src/cmd/map/map.c +++ b/src/cmd/map/map.c @@ -1204,7 +1204,7 @@ inpoly(double x, double y) } void -realcut() +realcut(void) { struct place g; double lat; diff --git a/src/cmd/mk/unix.c b/src/cmd/mk/unix.c index 12f391c8..28951f55 100644 --- a/src/cmd/mk/unix.c +++ b/src/cmd/mk/unix.c @@ -278,7 +278,7 @@ notifyf(int sig) } void -catchnotes() +catchnotes(void) { int i; diff --git a/src/cmd/postscript/common/bbox.c b/src/cmd/postscript/common/bbox.c index 67dabf32..b6807a4d 100644 --- a/src/cmd/postscript/common/bbox.c +++ b/src/cmd/postscript/common/bbox.c @@ -67,7 +67,7 @@ cover(x, y) } /* End of cover */ /*****************************************************************************/ -void resetbbox(); +void resetbbox(int); void writebbox(fp, keyword, slop) diff --git a/src/cmd/postscript/common/misc.c b/src/cmd/postscript/common/misc.c index dd34c6db..aca58f0e 100644 --- a/src/cmd/postscript/common/misc.c +++ b/src/cmd/postscript/common/misc.c @@ -24,7 +24,6 @@ void error(int kind, char *mesg, unsigned int a1, unsigned int a2, unsigned int int cat(char *file); /*****************************************************************************/ -extern int str_convert(); void out_list(str) diff --git a/src/cmd/postscript/download/download.c b/src/cmd/postscript/download/download.c index fa1d9882..31aa1b3b 100644 --- a/src/cmd/postscript/download/download.c +++ b/src/cmd/postscript/download/download.c @@ -88,16 +88,16 @@ int atend = FALSE; /* TRUE only if a comment says so */ FILE *fp_in; /* next input file */ FILE *fp_temp = NULL; /* for copying stdin */ -void init_signals(); -void options(); -void readmap(); -void readresident(); -void arguments(); -void done(); -void download(); +void init_signals(void); +void options(void); +void readmap(void); +void readresident(void); +void arguments(void); +void done(void); +void download(void); int lookup(char *font); void copyfonts(char *list); -void copyinput(); +void copyinput(void); extern int cat(char *file); extern void error(int errtype, char *fmt, ...); diff --git a/src/cmd/sam/disk.c b/src/cmd/sam/disk.c index f27e94ba..81c98389 100644 --- a/src/cmd/sam/disk.c +++ b/src/cmd/sam/disk.c @@ -25,7 +25,7 @@ extern int tempdisk(void); #endif Disk* -diskinit() +diskinit(void) { Disk *d; diff --git a/src/libhtml/lex.c b/src/libhtml/lex.c index 9a47dde8..0755ac34 100644 --- a/src/libhtml/lex.c +++ b/src/libhtml/lex.c @@ -416,7 +416,7 @@ static int winchars[]= { 8226, // 8226 is a bullet static StringInt* tagtable; // initialized from tagnames static StringInt* attrtable; // initialized from attrnames -static void lexinit(); +static void lexinit(void); static int getplaindata(TokenSource* ts, Token* a, int* pai); static int getdata(TokenSource* ts, int firstc, int starti, Token* a, int* pai); static int getscriptdata(TokenSource* ts, int firstc, int starti, Token* a, int* pai); diff --git a/src/libthread/thread.c b/src/libthread/thread.c index ddd7564c..387b6400 100644 --- a/src/libthread/thread.c +++ b/src/libthread/thread.c @@ -141,7 +141,7 @@ threadalloc(void (*fn)(void*), void *arg, uint stack) y = z; z >>= 16; /* hide undefined 32-bit shift from 32-bit compilers */ x = z>>16; - makecontext(&t->context.uc, (void(*)())threadstart, 2, y, x); + makecontext(&t->context.uc, (void(*)(void))threadstart, 2, y, x); return t; } -- cgit v1.2.3