commit 2b6040818e35d57357226212c356ce370c5b5dd0 from: rsc date: Sat May 07 22:42:14 2005 UTC use full prototypes commit - bb0266fe6137ecd81eea1c74e34723c5a1bc4caf commit + 2b6040818e35d57357226212c356ce370c5b5dd0 blob - 3aec8752da27fd42ab9d4ea0c95e79dbd05d23e9 blob + 91175a6fc0341c4d7379aa4d830def6e08294839 --- src/cmd/astro/dist.c +++ src/cmd/astro/dist.c @@ -192,7 +192,7 @@ event(char *format, char *arg1, char *arg2, double tim 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) blob - f8ded13d5216acfbccaf624e406aafa6fc92c07b blob + beae7efea5a74c7fc4e55b22eee89c53f14494af --- src/cmd/auth/ssh-agent.c +++ 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) blob - 7efff9768ecb933a6c78e68047aa7864b51e1498 blob + 1739ef5d1493f1e8dbf954912426fe3aeb0554dc --- src/cmd/join.c +++ 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; blob - 8d4dbfc2d924ef4ed66deacfd52a2f4a52b8f162 blob + 74ae79ac314dc9f7bcc9bedbe11760d6ce1b6aab --- src/cmd/map/map.c +++ src/cmd/map/map.c @@ -1204,7 +1204,7 @@ inpoly(double x, double y) } void -realcut() +realcut(void) { struct place g; double lat; blob - 12f391c8d500e9ff5647ea73e6357c4dc117a7fc blob + 28951f55854685abbc99efb32770a0fb67004abc --- src/cmd/mk/unix.c +++ src/cmd/mk/unix.c @@ -278,7 +278,7 @@ notifyf(int sig) } void -catchnotes() +catchnotes(void) { int i; blob - 67dabf32e4d5d9652b910e4f99b4f1d65ea3b9cf blob + b6807a4d102cd78628bf2fa62aa0faa4c0abd121 --- src/cmd/postscript/common/bbox.c +++ 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) blob - dd34c6db1bfd3b3139098bb2e1a1dcf87eb903a9 blob + aca58f0e3e02258fc82250c829145f4b9ee20c17 --- src/cmd/postscript/common/misc.c +++ src/cmd/postscript/common/misc.c @@ -24,7 +24,6 @@ void error(int kind, char *mesg, unsigned int a1, unsi int cat(char *file); /*****************************************************************************/ -extern int str_convert(); void out_list(str) blob - fa1d988242cca6f8030386e0c5807b97a42b6dde blob + 31aa1b3bfb46a8bcc23c269ab121850bafd48571 --- src/cmd/postscript/download/download.c +++ 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, ...); blob - f27e94ba4108f29c6fe906641e231b8627c3a2c9 blob + 81c983892dc869db4f3163e990930fc8aa95b1b6 --- src/cmd/sam/disk.c +++ src/cmd/sam/disk.c @@ -25,7 +25,7 @@ extern int tempdisk(void); #endif Disk* -diskinit() +diskinit(void) { Disk *d; blob - 9a47dde8c6d67afcde5d9fcd1b26909ace0f5aed blob + 0755ac344d45d8c2bec03f35596908605d7afe1f --- src/libhtml/lex.c +++ 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); blob - ddd7564c95c8b08ec07c79e88fb90de68882bf66 blob + 387b6400d43c2da86de97f89f47e5298c5ac364b --- src/libthread/thread.c +++ 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; }