From 237baffca953fbd9de91c23f87d4309011672871 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 17 Feb 2004 17:59:30 +0000 Subject: [PATCH] Supply prototypes where possible. This uncovered type errors with thread entrypoints: (lwpSelect, shutdown_sequence): Parameters didn't match thread entry point prototype. (lwpEntryPoint): Arguments didn't match thread entry point prototype. Change linkage of functions without prototype declaration to static where possible. Remove some superflous declarations, replace others by suitable includes. --- include/budg.h | 10 +- include/combat.h | 3 - include/empthread.h | 31 ++-- include/file.h | 2 +- include/item.h | 2 +- include/land.h | 7 +- include/lwp.h | 43 +++-- include/misc.h | 72 +------- include/nat.h | 1 - include/nsc.h | 7 +- include/optlist.h | 8 +- include/path.h | 5 +- include/plane.h | 8 +- include/player.h | 1 - include/prototype.h | 44 ----- include/prototypes.h | 12 +- include/sect.h | 2 +- include/ship.h | 5 +- include/trade.h | 4 +- include/xy.h | 1 - src/client/expect.c | 10 +- src/client/fnlist.h | 2 +- src/client/handle.c | 3 +- src/client/host.c | 11 +- src/client/ioqueue.c | 74 +++----- src/client/login.c | 11 +- src/client/main.c | 30 ++-- src/client/queue.c | 13 +- src/client/saveargv.c | 5 +- src/client/servcmd.c | 45 ++--- src/client/serverio.c | 6 +- src/client/tags.c | 5 +- src/client/termio.c | 16 +- src/client/termlib.c | 9 +- src/doconfig/doconfig.c | 2 +- src/lib/as/as.h | 6 +- src/lib/as/as_cache.c | 6 +- src/lib/as/as_search.c | 1 - src/lib/commands/anti.c | 1 - src/lib/commands/best.c | 2 +- src/lib/commands/bomb.c | 1 - src/lib/commands/budg.c | 1 - src/lib/commands/buil.c | 5 +- src/lib/commands/cons.c | 4 +- src/lib/commands/desi.c | 2 - src/lib/commands/diss.c | 1 - src/lib/commands/land.c | 1 - src/lib/commands/ldump.c | 2 +- src/lib/commands/look.c | 1 - src/lib/commands/lstat.c | 2 +- src/lib/commands/mark.c | 2 +- src/lib/commands/mfir.c | 1 - src/lib/commands/miss.c | 1 - src/lib/commands/mora.c | 1 - src/lib/commands/new.c | 3 +- src/lib/commands/path.c | 2 +- src/lib/commands/shut.c | 3 +- src/lib/commands/sinf.c | 3 +- src/lib/commands/thre.c | 2 +- src/lib/commands/upgr.c | 2 + src/lib/common/file.c | 2 - src/lib/common/keyword.c | 2 - src/lib/common/log.c | 2 +- src/lib/common/path.c | 6 +- src/lib/common/sectdamage.c | 2 +- src/lib/empthread/lwp.c | 4 +- src/lib/empthread/ntthread.c | 2 +- src/lib/empthread/pthread.c | 6 +- src/lib/gen/emp_config.c | 5 +- src/lib/gen/getstarg.c | 2 - src/lib/gen/io.c | 4 +- src/lib/gen/onearg.c | 1 - src/lib/lwp/arch.c | 65 ++----- src/lib/lwp/lwp.c | 76 +++----- src/lib/lwp/lwpint.h | 32 ++-- src/lib/lwp/misc/lwp.h | 41 ++--- src/lib/lwp/queue.c | 7 +- src/lib/lwp/sel.c | 17 +- src/lib/lwp/sem.c | 10 +- src/lib/player/empmod.c | 338 +++++++++++++++++------------------ src/lib/player/player.c | 1 - src/lib/subs/aswplnsubs.c | 1 - src/lib/subs/attsub.c | 5 +- src/lib/subs/lndsub.c | 1 - src/lib/subs/mission.c | 3 +- src/lib/subs/move.c | 3 +- src/lib/subs/retreat.c | 2 - src/lib/subs/show.c | 3 +- src/lib/subs/shpsub.c | 2 - src/lib/subs/takeover.c | 1 - src/lib/update/distribute.c | 3 +- src/lib/update/finish.c | 7 +- src/lib/update/land.c | 2 - src/lib/update/mobility.c | 2 +- src/lib/update/nav_ship.c | 1 - src/lib/update/nav_util.c | 2 - src/lib/update/revolt.c | 4 - src/lib/update/ship.c | 1 - src/server/idle.c | 3 +- src/server/lostitem.c | 3 +- src/server/main.c | 18 +- src/server/marketup.c | 6 +- src/server/shutdown.c | 4 +- src/server/timestamp.c | 6 +- src/server/update.c | 10 +- src/util/fairland.c | 93 ++++------ src/util/files.c | 1 - src/util/pconfig.c | 4 +- 108 files changed, 505 insertions(+), 877 deletions(-) delete mode 100644 include/prototype.h diff --git a/include/budg.h b/include/budg.h index 06150cfb..a5a6ca17 100644 --- a/include/budg.h +++ b/include/budg.h @@ -31,10 +31,10 @@ * Ville Virrankoski, 1995 */ -void fill_update_array(); -int *get_wp(); -int gt_bg_nmbr(); -void pt_bg_nmbr(); -void get_materials(); +void fill_update_array(int *bp, struct sctstr *sp); +int *get_wp(int *bp, struct sctstr *sp, int cm); +int gt_bg_nmbr(int *bp, struct sctstr *sp, int comm); +void pt_bg_nmbr(int *bp, struct sctstr *sp, int comm, int amount); +void get_materials(struct sctstr *sp, int *bp, int *mvec, int check); extern int mil_dbl_pay; diff --git a/include/combat.h b/include/combat.h index 856d9fd8..5b8286aa 100644 --- a/include/combat.h +++ b/include/combat.h @@ -97,9 +97,6 @@ extern int att_fight(int, struct combat *, struct emp_qelem *, double, extern int att_free_lists(struct emp_qelem *, struct emp_qelem *); -extern double att_asupport(); -extern double att_dsupport(); -extern double att_mine_dsupport(); extern double combat_mob; extern s_char *att_mode[]; diff --git a/include/empthread.h b/include/empthread.h index d0eed391..1e5709fa 100644 --- a/include/empthread.h +++ b/include/empthread.h @@ -36,7 +36,6 @@ #ifndef _EMTHREAD_H_ #define _EMTHREAD_H_ -#include "prototype.h" #include "misc.h" #if defined(_WIN32) @@ -66,14 +65,13 @@ typedef struct lwpSem empth_sem_t; #define EMPTH_PRINT 0x1 #define EMPTH_STACKCHECK 0x2 -typedef void (*vf_ptr) (); #define EMPTH_KILLED 1 typedef struct empth_ctx_t { char *name; /* thread name */ char *desc; /* description */ void *ud; /* user data */ int state; /* my state */ - vf_ptr ep; /* entry point */ + void (*ep)(void *); /* entry point */ pthread_t id; /* thread id */ } empth_t; @@ -110,20 +108,19 @@ typedef void empth_sem_t; #endif -int empth_init _PROTO((char **ctx, int flags)); -empth_t *empth_create _PROTO((int, void (*)(), int, - int, char *, char *, void *)); -empth_t *empth_self(); -void empth_exit _PROTO((void)); -void empth_yield _PROTO((void)); -void empth_terminate _PROTO((empth_t *)); -void empth_select _PROTO((int fd, int flags)); -void empth_wakeup _PROTO((empth_t *)); -void empth_sleep _PROTO((long until)); -empth_sem_t *empth_sem_create _PROTO((char *name, int count)); -void empth_sem_signal _PROTO((empth_sem_t *)); -void empth_sem_wait _PROTO((empth_sem_t *)); -void empth_alarm _PROTO((int)); +int empth_init(char **ctx, int flags); +empth_t *empth_create(int, void (*)(void *), int, int, char *, char *, void *); +empth_t *empth_self(void); +void empth_exit(void); +void empth_yield(void); +void empth_terminate(empth_t *); +void empth_select(int fd, int flags); +void empth_wakeup(empth_t *); +void empth_sleep(long until); +empth_sem_t *empth_sem_create(char *name, int count); +void empth_sem_signal(empth_sem_t *); +void empth_sem_wait(empth_sem_t *); +void empth_alarm(int); #include "prototypes.h" /* must come at end, after defines and typedefs */ diff --git a/include/file.h b/include/file.h index f6703276..cf20114f 100644 --- a/include/file.h +++ b/include/file.h @@ -109,7 +109,7 @@ extern int ef_vars(int, register s_char *, u_char **, u_char **, u_short **); extern int ef_byname(s_char *); -extern int ef_nbread(); +extern int ef_nbread(int type, int id, caddr_t ptr); extern struct empfile empfile[]; #endif /* _FILE_H_ */ diff --git a/include/item.h b/include/item.h index 888677b7..5013171c 100644 --- a/include/item.h +++ b/include/item.h @@ -53,7 +53,7 @@ extern int maxitem; /* procedures using/returning this struct */ -extern struct ichrstr *whatitem(); +extern struct ichrstr *whatitem(s_char *ptr, s_char *prompt); extern int itm_maxno; diff --git a/include/land.h b/include/land.h index cf393a93..8906d40b 100644 --- a/include/land.h +++ b/include/land.h @@ -228,10 +228,7 @@ extern int lnd_support(natid, natid, coord, coord); extern int lnd_can_attack(struct lndstr *); extern int lnd_fortify (struct lndstr *lp, int hard_amt); -void landdamage(); -void lnd_nav(); -int lnd_check_nav(); -double sqrt(); -s_char *prland(); +void landdamage(struct lndstr *lp, int dam); +s_char *prland(struct lndstr *lp); #endif /* _LAND_H_ */ diff --git a/include/lwp.h b/include/lwp.h index f29a0d4a..435b229a 100644 --- a/include/lwp.h +++ b/include/lwp.h @@ -22,7 +22,6 @@ */ #ifndef _LWP_H_ #define _LWP_H_ -#include "prototype.h" #ifdef UCONTEXT #include #else /* UCONTEXT */ @@ -42,7 +41,7 @@ struct lwpProc { #endif /* UCONTEXT */ void *sbtm; /* bottom of stack attached to it */ int size; /* size of stack */ - void (*entry) (); /* entry point */ + void (*entry)(void *); /* entry point */ int dead; /* whether the process can be rescheduled */ int pri; /* which scheduling queue we're on */ long runtime; /* time at which process is restarted */ @@ -76,27 +75,27 @@ struct lwpSem { #define LWP_MAX_PRIO 8 -struct lwpProc *lwpInitSystem _PROTO((int prio, char **ctxp, int flags)); -struct lwpProc *lwpCreate _PROTO((int prio, void (*)(), int size, - int flags, char *name, char *desc, - int argc, char **argv, void *ud)); -void lwpExit _PROTO((void)); -void lwpTerminate _PROTO((struct lwpProc * p)); -void lwpYield _PROTO((void)); -void lwpSleepFd _PROTO((int fd, int flags)); -void lwpSleepUntil _PROTO((long until)); -void lwpWakeupFd _PROTO((struct lwpProc * p)); -void *lwpGetUD _PROTO((struct lwpProc * p)); -void lwpSetUD _PROTO((struct lwpProc * p, char *ud)); -void lwpSetDesc _PROTO((struct lwpProc * p, char *name, char *desc)); -int lwpSetPriority _PROTO((int prio)); -void lwpReschedule _PROTO((void)); +struct lwpProc *lwpInitSystem(int prio, char **ctxp, int flags); +struct lwpProc *lwpCreate(int prio, void (*)(void *), int size, + int flags, char *name, char *desc, + int argc, char **argv, void *ud); +void lwpExit(void); +void lwpTerminate(struct lwpProc * p); +void lwpYield(void); +void lwpSleepFd(int fd, int flags); +void lwpSleepUntil(long until); +void lwpWakeupFd(struct lwpProc * p); +void *lwpGetUD(struct lwpProc * p); +void lwpSetUD(struct lwpProc * p, char *ud); +void lwpSetDesc(struct lwpProc * p, char *name, char *desc); +int lwpSetPriority(int prio); +void lwpReschedule(void); -struct lwpSem *lwpCreateSem _PROTO((char *name, int count)); -void lwpSignal _PROTO((struct lwpSem *)); -void lwpWait _PROTO((struct lwpSem *)); -void lwpSelect _PROTO((int argc, char **argv)); -void lwpStatus _PROTO((struct lwpProc * proc, char *format, ...)); +struct lwpSem *lwpCreateSem(char *name, int count); +void lwpSignal(struct lwpSem *); +void lwpWait(struct lwpSem *); +void lwpSelect(void *); +void lwpStatus(struct lwpProc * proc, char *format, ...); extern struct lwpProc *LwpCurrent; diff --git a/include/misc.h b/include/misc.h index 92a49e5f..0a407d86 100644 --- a/include/misc.h +++ b/include/misc.h @@ -57,7 +57,6 @@ typedef unsigned int u_int; /*#define _POSIX_ */ #endif -#include "prototype.h" #include "options.h" /* This is the structure we use to keep track of the global mobility @@ -115,7 +114,6 @@ typedef short coord; /* also change NSC_COORD in nsc.h */ #define hours(x) (60*60*(x)) #define days(x) (60*60*24*(x)) -typedef void (*voidfunc) (); typedef int (*qsort_func_t) (const void *, const void *); /* return codes from command routines */ @@ -124,70 +122,18 @@ typedef int (*qsort_func_t) (const void *, const void *); #define RET_SYN 2 /* syntax error in command */ #define RET_SYS 3 /* system error (missing file, etc) */ -#define MAX_DISTPATH_LEN 10 /* Has to go somewhere */ +double dmax(double n1, double n2); +double dmin(double n1, double n2); -/* - * references to library functions which aren't related to any - * particular object, and are of general interest - */ -#if !defined(ALPHA) && !defined(__osf__) && !defined(__linux__) && !defined(_WIN32) -extern long random(); -#endif - -double dmax _PROTO((double n1, double n2)); -double dmin _PROTO((double n1, double n2)); - -extern s_char *numstr _PROTO((s_char buf[], int n)); -extern s_char *esplur _PROTO((int n)); -extern s_char *splur _PROTO((int n)); -extern s_char *iesplur _PROTO((int n)); -extern s_char *plur _PROTO((int n, s_char *no, s_char *yes)); -extern s_char *getstarg -_PROTO((s_char *input, s_char *prompt, s_char buf[])); -extern s_char *getstring _PROTO((s_char *prompt, s_char buf[])); +extern s_char *numstr(s_char buf[], int n); +extern s_char *esplur(int n); +extern s_char *splur(int n); +extern s_char *iesplur(int n); +extern s_char *plur(int n, s_char *no, s_char *yes); +extern s_char *getstarg(s_char *input, s_char *prompt, s_char buf[]); +extern s_char *getstring(s_char *prompt, s_char buf[]); extern s_char *prbuf(s_char *format, ...); -/* - * frequently used libc functions - */ - -#if !defined(_WIN32) -#if defined(linux) -#ifndef __STDC__ -extern char *malloc(); -extern char *calloc(); -#endif -#else -#if !defined(ALPHA) && !defined(__osf__) && !defined(ultrix) && !defined(hpux) && !defined(FBSD) -extern char *malloc(); -extern char *calloc(); -#endif -#endif -#endif - -#if (!defined (aix) && !defined (sgi)) -extern char *ctime(); -extern char *strncpy(); -extern char *strcpy(); -#endif /* !aix && !sgi */ - -extern time_t time(); -#if !defined(_WIN32) -#ifdef linux -#ifndef atof -extern double atof(); -#endif -#else -extern double atof(); -#endif -#endif - -#if !defined(_WIN32) -#if !defined (__ppc__) && !defined (hpux) && !defined (aix) && !defined (linux) && !defined(ALPHA) && !defined(__osf__) && !defined(SUN4) && !defined (Rel4) && !(defined (ultrix) && (defined (__STDC__) || defined (__SYSTEMFIVE) || defined (__POSIX))) -extern char *sprintf(); -#endif /* aix */ -#endif - #define MAXCHRNV 12 #include "prototypes.h" /* must come at end, after defines and typedefs */ diff --git a/include/nat.h b/include/nat.h index 891715a6..6abba322 100644 --- a/include/nat.h +++ b/include/nat.h @@ -191,7 +191,6 @@ extern void putrel(struct natstr *np, natid them, int relate); extern void putreject(struct natstr *np, natid them, int how, int what); extern void putcontact(struct natstr *np, natid them, int contact); extern void agecontact(struct natstr *np); -extern struct fixnat *natfield(); #define NF_INFORM bit(0) /* Inform me of telegrams right away */ #define NF_FLASH bit(1) /* Allow other players to flash me (sicko :) */ diff --git a/include/nsc.h b/include/nsc.h index 8a03763f..15493c77 100644 --- a/include/nsc.h +++ b/include/nsc.h @@ -34,7 +34,6 @@ #ifndef _NSC_H_ #define _NSC_H_ -#include "prototype.h" #include "xy.h" #define NS_LSIZE 128 @@ -55,7 +54,7 @@ struct nstr_sect { struct range range; /* area of coverage */ int dist; /* dist query: range */ coord cx, cy; /* dist query: center x-y */ - int (*read) (); /* read function */ + int (*read)(int type, int id, caddr_t ptr); /* read function */ int ncond; /* # of selection conditions */ struct nscstr cond[NS_NCOND]; /* selection conditions */ }; @@ -72,7 +71,7 @@ struct nstr_item { int size; /* NS_LIST: size of list */ int index; /* NS_LIST: index */ int list[NS_LSIZE]; /* NS_LIST: item list */ - int (*read) (); /* read function */ + int (*read)(int type, int id, caddr_t ptr); /* read function */ int flags; /* EFF_ flags */ int ncond; /* # of selection conditions */ struct nscstr cond[NS_NCOND]; /* selection conditions */ @@ -161,6 +160,6 @@ extern s_char *nstr_comp(struct nscstr *, int *, int, s_char *); extern int encode(register s_char *, long *, int); -extern s_char *decodep _PROTO((register long code, register void *addr)); +extern s_char *decodep(register long code, register void *addr); #endif /* _NSC_H_ */ diff --git a/include/optlist.h b/include/optlist.h index 65b23327..a1bfe52e 100644 --- a/include/optlist.h +++ b/include/optlist.h @@ -35,8 +35,6 @@ #ifndef _OPTLIST_H_ #define _OPTLIST_H_ -#include "prototype.h" - struct option_list { char *opt_key; int *opt_valuep; @@ -44,8 +42,8 @@ struct option_list { extern struct option_list Options[]; -extern void set_option _PROTO((const char *key)); -extern void delete_option _PROTO((const char *key)); +extern void set_option(const char *key); +extern void delete_option(const char *key); extern int WORLD_X; extern int WORLD_Y; @@ -104,7 +102,7 @@ extern int opt_ROLLOVER_AVAIL; struct keymatch; /* forward decl */ /* function prototype for variable setting routines */ -typedef void KmFunc _PROTO((struct keymatch * kp, s_char **av)); +typedef void KmFunc(struct keymatch * kp, s_char **av); /* current known routines */ #if defined(__cplusplus) || (defined(__STDC__) &&__STDC__) diff --git a/include/path.h b/include/path.h index b990bc3e..684e549b 100644 --- a/include/path.h +++ b/include/path.h @@ -72,10 +72,7 @@ extern int chkpath(natid, s_char *, coord, coord); extern void pathrange(register coord, register coord, register s_char *, int, struct range *); -extern s_char *masktopath(); -extern long pathtomask(); - -extern double sector_mcost(); +extern double sector_mcost(struct sctstr *sp, int do_bonus); #define P_NONE 0 /* NO destinations allowed */ #define P_WALKING 1 /* use BestLandPath, only owned */ diff --git a/include/plane.h b/include/plane.h index 3becdf3a..2004373b 100644 --- a/include/plane.h +++ b/include/plane.h @@ -165,14 +165,10 @@ struct shiplook { #define PLN_LOAD(b, t) (t ? (b * (logx((double)t, (double)50.0) < 1.0 ? 1.0 : \ logx((double)t, (double)50.0))) : b) -double sqrt(); -double logx(); - -float pln_damage_sect(); +double logx(double d, double base); void count_planes(); -double sqrt(); -s_char *prplane(); +s_char *prplane(struct plnstr *pp); /* src/lib/subs/aircombat.c */ diff --git a/include/player.h b/include/player.h index a1744fb2..19402813 100644 --- a/include/player.h +++ b/include/player.h @@ -39,7 +39,6 @@ #if !defined(_WIN32) #include #endif -#include "prototype.h" #include "queue.h" #include "misc.h" #include "com.h" diff --git a/include/prototype.h b/include/prototype.h deleted file mode 100644 index 68ec07f5..00000000 --- a/include/prototype.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Empire - A multi-player, client/server Internet based war game. - * Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak, - * Ken Stevens, Steve McClure - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * --- - * - * See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the - * related information and legal notices. It is expected that any future - * projects/authors will amend these files as needed. - * - * --- - * - * prototype.h: Various prototype stuff - * - * Known contributors to this file: - * - */ - -/* this stuff ought to be somewhere general... */ -#ifndef _PROTOTYPE_H_ -#define _PROTOTYPE_H_ -#if defined(__cplusplus) || (defined(__STDC__) &&__STDC__) || defined(_WIN32) -#define _PROTO(x) x -#else -#define _PROTO(x) () -#define const -#define volatile -#endif -#endif /* _PROTOTYPE_H_ */ diff --git a/include/prototypes.h b/include/prototypes.h index dca8442d..a7c69141 100644 --- a/include/prototypes.h +++ b/include/prototypes.h @@ -58,7 +58,7 @@ extern void shutdwn(int sig); /* src/lib/empthread/lwp.c */ #ifdef _EMPTH_LWP extern int empth_init(char **ctx, int flags); -extern empth_t *empth_create(int prio, void (*entry) (), int size, +extern empth_t *empth_create(int prio, void (*entry)(void *), int size, int flags, char *name, char *desc, void *ud); #if 0 extern void empth_setctx(void *ctx); @@ -79,7 +79,7 @@ extern void empth_alarm(int sig); /* src/lib/empthread/pthread.c */ #ifdef _EMPTH_POSIX extern int empth_init(char **ctx_ptr, int flags); -extern empth_t *empth_create(int prio, void (*entry) (), +extern empth_t *empth_create(int prio, void (*entry)(void *), int size, int flags, char *name, char *desc, void *ud); extern empth_t *empth_self(void); @@ -346,9 +346,9 @@ extern s_char *decodep(long, void *); extern int decode(natid, long, void *, int); extern int nstr_exec(struct nscstr *, register int, void *, int); /* path.c */ -extern void bp_enable_cachepath(); -extern void bp_disable_cachepath(); -extern void bp_clear_cachepath(); +extern void bp_enable_cachepath(void); +extern void bp_disable_cachepath(void); +extern void bp_clear_cachepath(void); extern s_char *BestDistPath(s_char *, struct sctstr *, struct sctstr *, double *, int); extern s_char *BestLandPath(s_char *, struct sctstr *, struct sctstr *, @@ -856,6 +856,6 @@ extern int feed_ship(struct shpstr *, register int *, int, int *, int); */ /* shutdown.c */ extern void shutdown_init(void); -extern void shutdown_sequence(int argc, s_char **argv); +extern void shutdown_sequence(void *); #endif /* _PROTOTYPES_H_ */ diff --git a/include/sect.h b/include/sect.h index e4e512dd..dfc0e8c3 100644 --- a/include/sect.h +++ b/include/sect.h @@ -168,7 +168,7 @@ struct dchrstr { /* things relating to sectors */ extern int sctoff(coord x, coord y); -extern double landgun(); +extern double landgun(int effic, int guns); extern int sct_maxno; extern struct dchrstr dchr[]; diff --git a/include/ship.h b/include/ship.h index 7eaceadc..97e20d4e 100644 --- a/include/ship.h +++ b/include/ship.h @@ -193,7 +193,7 @@ struct mchrstr { #define getshipp(n) \ (struct shpstr *) ef_ptr(EF_SHIP, n) -extern double seagun(); +extern double seagun(int effic, int guns); extern struct mchrstr mchr[]; extern int shp_maxno; @@ -216,8 +216,7 @@ struct mlist { #define SHP_FIR(b, t) (t ? (b * (logx((double)t, (double)60.0) < 1.0 ? 1.0 : \ logx((double)t, (double)60.0))) : b) -double sqrt(); -double logx(); +double logx(double d, double base); /* return codes from shp_check_nav */ #define CN_NAVIGABLE (0) diff --git a/include/trade.h b/include/trade.h index bca64db7..9beac75c 100644 --- a/include/trade.h +++ b/include/trade.h @@ -43,8 +43,6 @@ #include "land.h" #include "ship.h" -#include "prototype.h" - struct trdstr { short ef_type; natid trd_owner; @@ -76,7 +74,7 @@ union trdgenstr { struct shpstr shp; }; -s_char *trade_nameof _PROTO((struct trdstr * tp, union trdgenstr * tgp)); +s_char *trade_nameof(struct trdstr * tp, union trdgenstr * tgp); #define gettrade(n, p) \ ef_read(EF_TRADE, n, (caddr_t)p) diff --git a/include/xy.h b/include/xy.h index 163859c8..bb827627 100644 --- a/include/xy.h +++ b/include/xy.h @@ -53,7 +53,6 @@ struct range { int height; }; -extern s_char *xyfmt(); extern s_char *xyas(coord x, coord y, natid country); extern s_char *ownxy(struct sctstr *sp); extern coord xrel(struct natstr *np, coord absx); diff --git a/src/client/expect.c b/src/client/expect.c index 803f4103..b44ee9fd 100644 --- a/src/client/expect.c +++ b/src/client/expect.c @@ -46,10 +46,7 @@ #endif int -expect(s, match, buf) -int s; -int match; -s_char *buf; +expect(int s, int match, s_char *buf) { int size; s_char *p; @@ -143,10 +140,7 @@ s_char *buf; } void -sendcmd(s, cmd, arg) -int s; -int cmd; -s_char *arg; +sendcmd(int s, int cmd, s_char *arg) { extern struct fn fnlist[]; s_char buf[128]; diff --git a/src/client/fnlist.h b/src/client/fnlist.h index 908c7a75..bccff963 100644 --- a/src/client/fnlist.h +++ b/src/client/fnlist.h @@ -36,7 +36,7 @@ #define _FNLIST_H_ struct fn { - int (*func) (); + int (*func)(void); s_char *name; int value; }; diff --git a/src/client/handle.c b/src/client/handle.c index ef3645f2..0cffd316 100644 --- a/src/client/handle.c +++ b/src/client/handle.c @@ -37,8 +37,7 @@ #endif int -handleintr(s) -int s; +handleintr(int s) { extern int interrupt; diff --git a/src/client/host.c b/src/client/host.c index 6900a937..d801c56c 100644 --- a/src/client/host.c +++ b/src/client/host.c @@ -50,9 +50,7 @@ #include "misc.h" int -hostaddr(name, addr) -s_char *name; -struct sockaddr_in *addr; +hostaddr(s_char *name, struct sockaddr_in *addr) { struct hostent *hp; @@ -76,9 +74,7 @@ struct sockaddr_in *addr; } int -hostport(name, addr) -s_char *name; -struct sockaddr_in *addr; +hostport(s_char *name, struct sockaddr_in *addr) { struct servent *sp; @@ -101,8 +97,7 @@ struct sockaddr_in *addr; } int -hostconnect(addr) -struct sockaddr_in *addr; +hostconnect(struct sockaddr_in *addr) { int s; diff --git a/src/client/ioqueue.c b/src/client/ioqueue.c index be4542bb..5d735b61 100644 --- a/src/client/ioqueue.c +++ b/src/client/ioqueue.c @@ -51,20 +51,18 @@ typedef struct iovec { #endif -static int ioqtobuf(); -static int ioqtoiov(); -static void enqueuecc(); -static int dequeuecc(); +static int ioqtobuf(register struct ioqueue *ioq, s_char *buf, int cc); +static int ioqtoiov(register struct ioqueue *ioq, register struct iovec *iov, register int max); +static void enqueuecc(struct ioqueue *ioq, s_char *buf, int cc); +static int dequeuecc(register struct ioqueue *ioq, register int cc); -void insque(); -void remque(); -void initque(); -struct qelem *makeqt(); +void insque(struct qelem *, struct qelem *); +void remque(struct qelem *); +void initque(struct qelem *p); +struct qelem *makeqt(int nelem); void -ioq_init(ioq, bsize) -struct ioqueue *ioq; -int bsize; +ioq_init(struct ioqueue *ioq, int bsize) { extern s_char num_teles[]; @@ -80,10 +78,7 @@ int bsize; * return # of iovec initialized. */ int -ioq_peekiov(ioq, iov, max) -struct ioqueue *ioq; -struct iovec *iov; -int max; +ioq_peekiov(struct ioqueue *ioq, struct iovec *iov, int max) { if (ioq->cc <= 0) return 0; @@ -96,18 +91,13 @@ int max; * number of bytes actually found. */ int -ioq_peek(ioq, buf, cc) -struct ioqueue *ioq; -s_char *buf; -int cc; +ioq_peek(struct ioqueue *ioq, s_char *buf, int cc) { return ioqtobuf(ioq, buf, cc); } int -ioq_dequeue(ioq, cc) -struct ioqueue *ioq; -int cc; +ioq_dequeue(struct ioqueue *ioq, int cc) { if (dequeuecc(ioq, cc) != cc) return 0; @@ -115,10 +105,7 @@ int cc; } int -ioq_read(ioq, buf, cc) -struct ioqueue *ioq; -s_char *buf; -int cc; +ioq_read(struct ioqueue *ioq, s_char *buf, int cc) { int n; @@ -129,24 +116,19 @@ int cc; } void -ioq_write(ioq, buf, cc) -struct ioqueue *ioq; -s_char *buf; -int cc; +ioq_write(struct ioqueue *ioq, s_char *buf, int cc) { enqueuecc(ioq, buf, cc); } int -ioq_qsize(ioq) -struct ioqueue *ioq; +ioq_qsize(struct ioqueue *ioq) { return ioq->cc; } void -ioq_drain(ioq) -struct ioqueue *ioq; +ioq_drain(struct ioqueue *ioq) { struct io *io; struct qelem *qp; @@ -161,10 +143,7 @@ struct ioqueue *ioq; } s_char * -ioq_gets(ioq, buf, cc) -struct ioqueue *ioq; -s_char *buf; -int cc; +ioq_gets(struct ioqueue *ioq, s_char *buf, int cc) { register s_char *p; register s_char *end; @@ -195,10 +174,7 @@ int cc; * left for a higher level. */ static int -ioqtobuf(ioq, buf, cc) -register struct ioqueue *ioq; -s_char *buf; -int cc; +ioqtobuf(register struct ioqueue *ioq, s_char *buf, int cc) { register struct io *io; struct qelem *qp; @@ -235,10 +211,7 @@ int cc; * of a full ioqueue still be quick. */ static int -ioqtoiov(ioq, iov, max) -register struct ioqueue *ioq; -register struct iovec *iov; -register int max; +ioqtoiov(register struct ioqueue *ioq, register struct iovec *iov, register int max) { register struct io *io; register int cc; @@ -265,10 +238,7 @@ register int max; * append a buffer to the end of the ioq. */ static void -enqueuecc(ioq, buf, cc) -struct ioqueue *ioq; -s_char *buf; -int cc; +enqueuecc(struct ioqueue *ioq, s_char *buf, int cc) { struct io *io; @@ -286,9 +256,7 @@ int cc; * which are no longer used. */ static int -dequeuecc(ioq, cc) -register struct ioqueue *ioq; -register int cc; +dequeuecc(register struct ioqueue *ioq, register int cc) { register struct io *io; register struct qelem *qp; diff --git a/src/client/login.c b/src/client/login.c index 1479cc12..f8c43e15 100644 --- a/src/client/login.c +++ b/src/client/login.c @@ -43,16 +43,11 @@ #include #endif -int expect(); -void sendcmd(); +int expect(int s, int match, s_char *buf); +void sendcmd(int s, int cmd, s_char *arg); int -login(s, uname, cname, cpass, kill_proc) -int s; -s_char *uname; -s_char *cname; -s_char *cpass; -int kill_proc; +login(int s, s_char *uname, s_char *cname, s_char *cpass, int kill_proc) { s_char tmp[128]; s_char buf[1024]; diff --git a/src/client/main.c b/src/client/main.c index 5da18dc1..e3571a15 100644 --- a/src/client/main.c +++ b/src/client/main.c @@ -72,27 +72,25 @@ HANDLE hStdIn; int interrupt; int sock; -void saveargv(); -void getsose(); -int hostport(); -int hostaddr(); -int hostconnect(); -int login(); -void ioq_init(); -void io_init(); -int handleintr(); -int termio(); -int serverio(); -void servercmd(); -void ioq_drain(); +void saveargv(int ac, s_char **src, s_char **dst); +void getsose(void); +int hostport(s_char *name, struct sockaddr_in *addr); +int hostaddr(s_char *name, struct sockaddr_in *addr); +int hostconnect(struct sockaddr_in *addr); +int login(int s, s_char *uname, s_char *cname, s_char *cpass, int kill_proc); +void ioq_init(struct ioqueue *ioq, int bsize); +void io_init(void); +int handleintr(int); +int termio(int fd, int sock, FILE *auxfi); +int serverio(int s, struct ioqueue *ioq); +void servercmd(struct ioqueue *ioq, FILE *auxfi); +void ioq_drain(struct ioqueue *ioq); static void intr(int sig); int -main(ac, av) -int ac; -s_char *av[]; +main(int ac, s_char **av) { #ifdef _WIN32 WSADATA WsaData; diff --git a/src/client/queue.c b/src/client/queue.c index 4de7856f..a7128576 100644 --- a/src/client/queue.c +++ b/src/client/queue.c @@ -39,9 +39,7 @@ #include "queue.h" void -insque(p, q) -struct qelem *p; -struct qelem *q; +insque(struct qelem *p, struct qelem *q) { p->q_forw = q->q_forw; p->q_back = q; @@ -50,24 +48,21 @@ struct qelem *q; } void -remque(p) -struct qelem *p; +remque(struct qelem *p) { p->q_back->q_forw = p->q_forw; p->q_forw->q_back = p->q_back; } void -initque(p) -struct qelem *p; +initque(struct qelem *p) { p->q_forw = p; p->q_back = p; } struct qelem * -makeqt(nelem) -int nelem; +makeqt(int nelem) { struct qelem *table; struct qelem *qp; diff --git a/src/client/saveargv.c b/src/client/saveargv.c index eacebd50..388ba57d 100644 --- a/src/client/saveargv.c +++ b/src/client/saveargv.c @@ -36,10 +36,7 @@ #include "misc.h" void -saveargv(ac, src, dst) -int ac; -s_char **src; -s_char **dst; +saveargv(int ac, s_char **src, s_char **dst) { register s_char *ptr; register int i; diff --git a/src/client/servcmd.c b/src/client/servcmd.c index 60cbb166..5e3f507b 100644 --- a/src/client/servcmd.c +++ b/src/client/servcmd.c @@ -48,7 +48,7 @@ #include #endif -extern s_char *gettag(); +extern s_char *gettag(s_char *p); s_char num_teles[64]; static s_char the_prompt[1024]; @@ -59,23 +59,21 @@ FILE *redir_fp; FILE *pipe_fp; int exec_fd; -void prompt(); -void doredir(); -void dopipe(); -void doexecute(); -void output(); -void screen(); -int sendeof(); -int termio(); -void _noecho(); +void prompt(FILE *auxfi); +void doredir(s_char *p); +void dopipe(s_char *p); +void doexecute(s_char *p, FILE *auxfi); +void output(int code, s_char *buf, FILE *auxfi); +void screen(register s_char *buf); +int sendeof(int); +int termio(int fd, int sock, FILE *auxfi); +void _noecho(int); extern s_char *SO; extern s_char *SE; void -servercmd(ioq, auxfi) -struct ioqueue *ioq; -FILE *auxfi; +servercmd(struct ioqueue *ioq, FILE *auxfi) { s_char *ioq_gets(struct ioqueue *, s_char *, int); s_char buf[1024]; @@ -133,8 +131,7 @@ FILE *auxfi; } void -prompt(auxfi) -FILE *auxfi; +prompt(FILE *auxfi) { if (mode == C_PROMPT) { if (redir_fp) { @@ -166,8 +163,7 @@ FILE *auxfi; * opens redir_fp if successful */ void -doredir(p) -s_char *p; +doredir(s_char *p) { s_char *how; s_char *name; @@ -219,8 +215,7 @@ s_char *p; * opens "pipe_fp" if successful */ void -dopipe(p) -s_char *p; +dopipe(s_char *p) { s_char *tag; @@ -250,9 +245,7 @@ s_char *p; } void -doexecute(p, auxfi) -s_char *p; -FILE *auxfi; +doexecute(s_char *p, FILE *auxfi) { extern int sock; int fd; @@ -296,10 +289,7 @@ FILE *auxfi; } void -output(code, buf, auxfi) -int code; -s_char *buf; -FILE *auxfi; +output(int code, s_char *buf, FILE *auxfi) { switch (code) { case C_NOECHO: @@ -357,8 +347,7 @@ FILE *auxfi; } void -screen(buf) -register s_char *buf; +screen(register s_char *buf) { register s_char *sop; register s_char c; diff --git a/src/client/serverio.c b/src/client/serverio.c index 57d69936..3420fc0e 100644 --- a/src/client/serverio.c +++ b/src/client/serverio.c @@ -47,12 +47,10 @@ #include #endif -void ioq_write(); +void ioq_write(struct ioqueue *ioq, s_char *buf, int cc); int -serverio(s, ioq) -int s; -struct ioqueue *ioq; +serverio(int s, struct ioqueue *ioq) { s_char *buf; int n; diff --git a/src/client/tags.c b/src/client/tags.c index 7661110b..cff7a39c 100644 --- a/src/client/tags.c +++ b/src/client/tags.c @@ -48,7 +48,7 @@ s_char exec[8]; static unsigned short tagnum; void -io_init() +io_init(void) { taglist = NULL; buf[0] = 0; @@ -57,8 +57,7 @@ io_init() } s_char * -gettag(p) -s_char *p; +gettag(s_char *p) { struct tagstruct *tag1, *tag2; diff --git a/src/client/termio.c b/src/client/termio.c index a5646c0e..73de77a6 100644 --- a/src/client/termio.c +++ b/src/client/termio.c @@ -60,13 +60,10 @@ extern s_char exec[]; extern HANDLE hStdIn; #endif -int sendeof(); +int sendeof(int sock); int -termio(fd, sock, auxfi) -int fd; -int sock; -FILE *auxfi; +termio(int fd, int sock, FILE *auxfi) { s_char out[4096]; int i, n; @@ -226,8 +223,7 @@ FILE *auxfi; } int -sendeof(sock) -int sock; +sendeof(int sock) { #ifndef _WIN32 if (write(sock, "ctld\n", 5) < 5) { @@ -245,8 +241,7 @@ int echomode = 1; #if defined(hpux) || defined(aix) || defined (sgi) || defined(linux) void -_noecho(fd) -int fd; +_noecho(int fd) { struct termio io; @@ -257,8 +252,7 @@ int fd; } void -_echo(fd) -int fd; +_echo(int fd) { struct termio io; diff --git a/src/client/termlib.c b/src/client/termlib.c index f5083fea..21472157 100644 --- a/src/client/termlib.c +++ b/src/client/termlib.c @@ -45,11 +45,10 @@ s_char *SO = 0; s_char *SE = 0; -int tgetent(); +int tgetent(char *, char *); void -parsedelay(r) -s_char *r; +parsedelay(s_char *r) { s_char *s, *t; @@ -64,10 +63,10 @@ s_char *r; } void -getsose() +getsose(void) { #ifndef _WIN32 - extern s_char *tgetstr(); + extern s_char *tgetstr(char *, char **); s_char *cp; s_char *term; static s_char tbuf[1024]; diff --git a/src/doconfig/doconfig.c b/src/doconfig/doconfig.c index 83fd4ebd..c42e7bfe 100644 --- a/src/doconfig/doconfig.c +++ b/src/doconfig/doconfig.c @@ -54,7 +54,7 @@ char *_ipglob_copyright_header = int -main() +main(void) { char buf[256]; char *cp; diff --git a/src/lib/as/as.h b/src/lib/as/as.h index cb95e316..50b1ed65 100644 --- a/src/lib/as/as.h +++ b/src/lib/as/as.h @@ -165,9 +165,9 @@ extern struct as_path *as_find_cachepath(coord fx, /* Functions that are "private" to algorithm */ extern void as_add_cachepath(struct as_data *adp); -extern void as_clear_cachepath(); -extern void as_enable_cachepath(); -extern void as_disable_cachepath(); +extern void as_clear_cachepath(void); +extern void as_enable_cachepath(void); +extern void as_disable_cachepath(void); extern void as_makepath(struct as_data *adp); extern void as_free_path(struct as_path *pp); diff --git a/src/lib/as/as_cache.c b/src/lib/as/as_cache.c index c3a12cf6..5d27ed27 100644 --- a/src/lib/as/as_cache.c +++ b/src/lib/as/as_cache.c @@ -55,13 +55,13 @@ static struct as_frompath **fromhead = (struct as_frompath **)0; static int as_cachepath_on = 0; /* Default to off */ void -as_enable_cachepath() +as_enable_cachepath(void) { as_cachepath_on = 1; } void -as_disable_cachepath() +as_disable_cachepath(void) { as_cachepath_on = 0; } @@ -135,7 +135,7 @@ as_add_cachepath(struct as_data *adp) } void -as_clear_cachepath() +as_clear_cachepath(void) { struct as_frompath *from, *from2; struct as_topath *to, *to2; diff --git a/src/lib/as/as_search.c b/src/lib/as/as_search.c index 7f957b30..fd885592 100644 --- a/src/lib/as/as_search.c +++ b/src/lib/as/as_search.c @@ -47,7 +47,6 @@ as_search(struct as_data *adp) struct as_queue *qp; struct as_path *pp; #endif /* DEBUG */ - struct as_queue *as_extend(struct as_data *adp); as_reset(adp); diff --git a/src/lib/commands/anti.c b/src/lib/commands/anti.c index 981fe4bd..bc62b9d5 100644 --- a/src/lib/commands/anti.c +++ b/src/lib/commands/anti.c @@ -67,7 +67,6 @@ anti(void) double odds, damil, dache; int mob; int n_cheleft; - extern double hap_fact(); if (!snxtsct(&nstr, player->argp[1])) return RET_SYN; diff --git a/src/lib/commands/best.c b/src/lib/commands/best.c index 0add43f5..8e0000ab 100644 --- a/src/lib/commands/best.c +++ b/src/lib/commands/best.c @@ -48,7 +48,7 @@ int best(void) { double cost; - s_char *BestDistPath(), *BestLandPath(), *s; + s_char *s; struct sctstr s1, s2; struct nstr_sect nstr, nstr2; s_char buf[1024]; diff --git a/src/lib/commands/bomb.c b/src/lib/commands/bomb.c index cbf44321..579d74fa 100644 --- a/src/lib/commands/bomb.c +++ b/src/lib/commands/bomb.c @@ -214,7 +214,6 @@ bomb(void) static void pin_bomb(struct emp_qelem *list, struct sctstr *target) { - extern s_char *effadv(); struct dchrstr *dcp; int nplanes; int nships; diff --git a/src/lib/commands/budg.c b/src/lib/commands/budg.c index c0d417f4..c71589c0 100644 --- a/src/lib/commands/budg.c +++ b/src/lib/commands/budg.c @@ -348,7 +348,6 @@ calc_all(long int (*p_sect)[2], int *taxes, int *Ncivs, int *Nuws, extern long lnd_money[MAXNOC]; extern long air_money[MAXNOC]; extern long tpops[MAXNOC]; - extern int mil_dbl_pay; lnd_money[player->cnum] = sea_money[player->cnum] = 0; air_money[player->cnum] = 0; diff --git a/src/lib/commands/buil.c b/src/lib/commands/buil.c index b9241120..b77bfc9d 100644 --- a/src/lib/commands/buil.c +++ b/src/lib/commands/buil.c @@ -31,6 +31,7 @@ * Steve McClure, 1998-2000 */ +#include #ifdef Rel4 #include #endif /* Rel4 */ @@ -69,9 +70,6 @@ static int build_plane(register struct sctstr *sp, static int cash; /* static ok */ -double sqrt(double); -double logx(); - extern int morale_base; extern int sect_mob_neg_factor; extern int etu_per_update; @@ -494,7 +492,6 @@ build_land(register struct sctstr *sp, register struct lchrstr *lp, int points; struct natstr *natp; float eff = ((float)LAND_MINEFF / 100.0); - double techfact(int, double); int mil, lcm, hcm, gun, shell; int freeland = 0; diff --git a/src/lib/commands/cons.c b/src/lib/commands/cons.c index 4313a497..d0d38d6c 100644 --- a/src/lib/commands/cons.c +++ b/src/lib/commands/cons.c @@ -111,9 +111,7 @@ static int cons_choose(struct ltcomstr *ltcp) { s_char *p; - extern int disloan(); - extern int distrea(); - int (*dis) (); + int (*dis)(); struct lonstr *lp; struct trtstr *tp; s_char prompt[128]; diff --git a/src/lib/commands/desi.c b/src/lib/commands/desi.c index 93995340..f51a6c6e 100644 --- a/src/lib/commands/desi.c +++ b/src/lib/commands/desi.c @@ -71,8 +71,6 @@ static long do_desi(struct natstr *natp, s_char *sects, s_char *deschar, long int cash, int for_real) { - extern int opt_NO_LCMS; - extern int opt_NO_HCMS; register int n; s_char *p; int breaksanct; diff --git a/src/lib/commands/diss.c b/src/lib/commands/diss.c index 1099e183..b61a5c47 100644 --- a/src/lib/commands/diss.c +++ b/src/lib/commands/diss.c @@ -53,7 +53,6 @@ int diss(void) { - int quit(void); struct sctstr sect; struct lndstr land; struct shpstr ship; diff --git a/src/lib/commands/land.c b/src/lib/commands/land.c index e4eb20fc..fffb012a 100644 --- a/src/lib/commands/land.c +++ b/src/lib/commands/land.c @@ -51,7 +51,6 @@ land(void) struct nstr_item ni; struct lndstr land; int vec[I_MAX + 1]; - s_char *mission_short_name(); if (!snxtitem(&ni, EF_LAND, player->argp[1])) return RET_SYN; diff --git a/src/lib/commands/ldump.c b/src/lib/commands/ldump.c index 6072e104..7a8d730b 100644 --- a/src/lib/commands/ldump.c +++ b/src/lib/commands/ldump.c @@ -53,7 +53,7 @@ ldump(void) struct nstr_item ni; struct lndstr land; int vec[I_MAX + 1]; - s_char *mission_short_name(); + s_char *mission_short_name(int); int n, i; struct natstr *np; time_t now; diff --git a/src/lib/commands/look.c b/src/lib/commands/look.c index b4e68189..5620493f 100644 --- a/src/lib/commands/look.c +++ b/src/lib/commands/look.c @@ -257,7 +257,6 @@ look_land(register struct lndstr *lookland) int vrange; int i; int dist; - double techfact(int, double); drange = techfact(lookland->lnd_tech, (double)lookland->lnd_spy); drange = (drange * ((double)lookland->lnd_effic / 100.0)); diff --git a/src/lib/commands/lstat.c b/src/lib/commands/lstat.c index f2445201..2b6edc54 100644 --- a/src/lib/commands/lstat.c +++ b/src/lib/commands/lstat.c @@ -50,7 +50,7 @@ lsta(void) int nunits; struct nstr_item ni; struct lndstr land; - s_char *mission_short_name(); + s_char *mission_short_name(int); if (!snxtitem(&ni, EF_LAND, player->argp[1])) return RET_SYN; diff --git a/src/lib/commands/mark.c b/src/lib/commands/mark.c index b9bab295..d35ec1da 100644 --- a/src/lib/commands/mark.c +++ b/src/lib/commands/mark.c @@ -57,7 +57,7 @@ mark(void) return display_mark(" "); } -void +static void pr_mark(struct comstr *comm) { time_t now; diff --git a/src/lib/commands/mfir.c b/src/lib/commands/mfir.c index 610542e9..4b35da69 100644 --- a/src/lib/commands/mfir.c +++ b/src/lib/commands/mfir.c @@ -780,7 +780,6 @@ quiet_bigdef(int attacker, struct emp_qelem *list, natid own, natid aown, struct sctstr firing; struct nstr_sect ns; struct flist *fp; - double techfact(int, double); extern int torpedo_damage; int gun; diff --git a/src/lib/commands/miss.c b/src/lib/commands/miss.c index bbcc7ac4..99b79f9a 100644 --- a/src/lib/commands/miss.c +++ b/src/lib/commands/miss.c @@ -71,7 +71,6 @@ mission(void) extern int land_mob_max; extern int plane_mob_max; extern double mission_mob_cost; - s_char *nameofitem(); s_char prompt[128]; s_char buf[1024]; diff --git a/src/lib/commands/mora.c b/src/lib/commands/mora.c index 0c1f0ecc..6d77f579 100644 --- a/src/lib/commands/mora.c +++ b/src/lib/commands/mora.c @@ -53,7 +53,6 @@ morale(void) int i, min; s_char *p; s_char mess[128]; - double techfact(int, double); s_char buf[1024]; if (!snxtitem(&np, EF_LAND, player->argp[1])) diff --git a/src/lib/commands/new.c b/src/lib/commands/new.c index 4a6aa96f..93b15419 100644 --- a/src/lib/commands/new.c +++ b/src/lib/commands/new.c @@ -46,8 +46,8 @@ #include "optlist.h" #include "commands.h" - #include +#include extern float start_education, start_happiness; extern float start_technology, start_research; @@ -321,7 +321,6 @@ deity_build_land(int type, coord x, coord y, natid own, int tlev) struct lchrstr *lp; struct nstr_item nstr; struct natstr *natp; - double techfact(int, double); int lvec[I_MAX + 1]; int extend = 1; diff --git a/src/lib/commands/path.c b/src/lib/commands/path.c index dcbf364a..7980dc17 100644 --- a/src/lib/commands/path.c +++ b/src/lib/commands/path.c @@ -58,7 +58,7 @@ path(void) coord cx, cy; int i; int y; - s_char *pp, *p, *BestDistPath(); + s_char *pp, *p; /* Note this is not re-entrant anyway, so we keep the buffers around */ static s_char *mapbuf = (s_char *)0; diff --git a/src/lib/commands/shut.c b/src/lib/commands/shut.c index c78ead66..1a0c299e 100644 --- a/src/lib/commands/shut.c +++ b/src/lib/commands/shut.c @@ -38,8 +38,7 @@ #include "nat.h" #include "file.h" #include "commands.h" - -extern void shutdown_sequence(); +#include "prototypes.h" int shut(void) diff --git a/src/lib/commands/sinf.c b/src/lib/commands/sinf.c index 6977a10e..6aa607ff 100644 --- a/src/lib/commands/sinf.c +++ b/src/lib/commands/sinf.c @@ -42,6 +42,7 @@ #include "path.h" #include "file.h" #include "commands.h" +#include "combat.h" int sinfra(void) @@ -49,8 +50,6 @@ sinfra(void) struct sctstr sect; int nsect; struct nstr_sect nstr; - double sector_mcost(); - double sector_strength(struct sctstr *); if (!snxtsct(&nstr, player->argp[1])) return RET_SYN; diff --git a/src/lib/commands/thre.c b/src/lib/commands/thre.c index 164389de..4f76e861 100644 --- a/src/lib/commands/thre.c +++ b/src/lib/commands/thre.c @@ -49,7 +49,7 @@ int thre(void) { - extern struct ichrstr *whatitem(); + extern struct ichrstr *whatitem(s_char *, s_char *); struct sctstr sect; struct nstr_sect nstr; int val; diff --git a/src/lib/commands/upgr.c b/src/lib/commands/upgr.c index e9f4b8e9..c767c548 100644 --- a/src/lib/commands/upgr.c +++ b/src/lib/commands/upgr.c @@ -32,6 +32,8 @@ * Steve McClure, 1996-2000 */ +#include + #include "misc.h" #include "player.h" #include "xy.h" diff --git a/src/lib/common/file.c b/src/lib/common/file.c index faf782b2..183f0ec1 100644 --- a/src/lib/common/file.c +++ b/src/lib/common/file.c @@ -424,8 +424,6 @@ ef_flags(int type) time_t ef_mtime(int type) { - extern time_t fdate(int fd); - if (empfile[type].fd <= 0) return 0; return fdate(empfile[type].fd); diff --git a/src/lib/common/keyword.c b/src/lib/common/keyword.c index cb882abb..4a80f9ba 100644 --- a/src/lib/common/keyword.c +++ b/src/lib/common/keyword.c @@ -110,8 +110,6 @@ kw_find(s_char *name) s_char * kw_parse(int type, s_char *text, int *data) { - s_char *get_time(s_char *ptr, int *data); - s_char *weekday(s_char *ptr, int *data); s_char *next; while (isspace(*text)) diff --git a/src/lib/common/log.c b/src/lib/common/log.c index dcc997d9..34bee7d5 100644 --- a/src/lib/common/log.c +++ b/src/lib/common/log.c @@ -51,7 +51,7 @@ static s_char *logfile = 0; s_char * -getlogfile() +getlogfile(void) { return (s_char *)logfile; } diff --git a/src/lib/common/path.c b/src/lib/common/path.c index 3bba0d7a..8f79912b 100644 --- a/src/lib/common/path.c +++ b/src/lib/common/path.c @@ -441,19 +441,19 @@ bp_coord_hash(struct as_coord c) } void -bp_enable_cachepath() +bp_enable_cachepath(void) { as_enable_cachepath(); } void -bp_disable_cachepath() +bp_disable_cachepath(void) { as_disable_cachepath(); } void -bp_clear_cachepath() +bp_clear_cachepath(void) { as_clear_cachepath(); } diff --git a/src/lib/common/sectdamage.c b/src/lib/common/sectdamage.c index cf1c2d59..d4c9964f 100644 --- a/src/lib/common/sectdamage.c +++ b/src/lib/common/sectdamage.c @@ -49,6 +49,7 @@ #include "gen.h" #include "subs.h" #include "lost.h" +#include "combat.h" int sect_damage(struct sctstr *sp, int dam, struct emp_qelem *list) @@ -93,7 +94,6 @@ sectdamage(struct sctstr *sp, int dam, struct emp_qelem *list) struct plnstr plane; double real_dam; int eff; - double sector_strength(); /* Some sectors are harder/easier to kill.. */ /* Average sector has a dstr of 1, so adjust */ diff --git a/src/lib/empthread/lwp.c b/src/lib/empthread/lwp.c index 70a76531..9879f002 100644 --- a/src/lib/empthread/lwp.c +++ b/src/lib/empthread/lwp.c @@ -46,8 +46,8 @@ empth_init(char **ctx, int flags) empth_t * -empth_create(int prio, void (*entry) (), int size, int flags, char *name, - char *desc, void *ud) +empth_create(int prio, void (*entry)(void *), int size, int flags, + char *name, char *desc, void *ud) { /* inherit flags */ if (!flags) diff --git a/src/lib/empthread/ntthread.c b/src/lib/empthread/ntthread.c index 2accf92a..3d827e4c 100644 --- a/src/lib/empthread/ntthread.c +++ b/src/lib/empthread/ntthread.c @@ -390,7 +390,7 @@ empth_init(char **ctx_ptr, int flags) * It is also passed to the entry function... */ empth_t * -empth_create(int prio, void (*entry) (), int size, int flags, +empth_create(int prio, void (*entry)(void *), int size, int flags, char *name, char *desc, void *ud) { loc_Thread_t *pThread = NULL; diff --git a/src/lib/empthread/pthread.c b/src/lib/empthread/pthread.c index 92f283ec..7c074705 100644 --- a/src/lib/empthread/pthread.c +++ b/src/lib/empthread/pthread.c @@ -57,9 +57,9 @@ static pthread_mutex_t mtx_ctxsw; /* thread in critical section */ #if 0 -static void empth_setctx _PROTO((void *)); +static void empth_setctx(void *); #endif -static void empth_restorectx _PROTO(()); +static void empth_restorectx(); static void * empth_start(void *ctx) @@ -176,7 +176,7 @@ empth_init(char **ctx_ptr, int flags) * More then that priority is not needed even in lwp threads. */ empth_t * -empth_create(int prio, void (*entry) (), int size, int flags, +empth_create(int prio, void (*entry)(void *), int size, int flags, char *name, char *desc, void *ud) { pthread_t t; diff --git a/src/lib/gen/emp_config.c b/src/lib/gen/emp_config.c index fb0c3412..7d4a4fba 100644 --- a/src/lib/gen/emp_config.c +++ b/src/lib/gen/emp_config.c @@ -392,9 +392,8 @@ struct keymatch configkeys[] = { {NULL, NULL, (caddr_t)0, 0, NULL} }; -static void fixup_files _PROTO((void)); -static struct keymatch *keylookup -_PROTO((s_char *key, struct keymatch tbl[])); +static void fixup_files(void); +static struct keymatch *keylookup(s_char *key, struct keymatch tbl[]); /* diff --git a/src/lib/gen/getstarg.c b/src/lib/gen/getstarg.c index fb42f5d1..64dfe84e 100644 --- a/src/lib/gen/getstarg.c +++ b/src/lib/gen/getstarg.c @@ -37,8 +37,6 @@ s_char * getstarg(s_char *input, s_char *prompt, s_char *buf) { - extern s_char *getstring(s_char *prompt, s_char *buf); - *buf = '\0'; if (input == 0 || *input == 0) { if (getstring(prompt, buf) == 0) diff --git a/src/lib/gen/io.c b/src/lib/gen/io.c index 16547bab..75a9c364 100644 --- a/src/lib/gen/io.c +++ b/src/lib/gen/io.c @@ -72,7 +72,7 @@ struct iop { int flags; s_char *assoc; int bufsize; - int (*notify) (); + int (*notify)(void); }; void @@ -81,7 +81,7 @@ io_init(void) } struct iop * -io_open(int fd, int flags, int bufsize, int (*notify) (void), +io_open(int fd, int flags, int bufsize, int (*notify)(void), s_char *assoc) { struct iop *iop; diff --git a/src/lib/gen/onearg.c b/src/lib/gen/onearg.c index b679d2b8..3f7f8253 100644 --- a/src/lib/gen/onearg.c +++ b/src/lib/gen/onearg.c @@ -37,7 +37,6 @@ int onearg(s_char *arg, s_char *prompt) { - extern s_char *getstring(s_char *prompt, s_char *buf); int n; s_char buf[1024]; diff --git a/src/lib/lwp/arch.c b/src/lib/lwp/arch.c index c076c89b..0d6dc44f 100644 --- a/src/lib/lwp/arch.c +++ b/src/lib/lwp/arch.c @@ -48,7 +48,8 @@ static struct lwpProc *tempcontext; struct lwpProc *initcontext = NULL; int startpoint; -startcontext() +static void +startcontext(void) { int space[10000]; int x; @@ -64,9 +65,7 @@ startcontext() } void -lwpInitContext(newp, sp) -struct lwpProc *newp; -void *sp; +lwpInitContext(struct lwpProc *newp, void *sp) { struct lwpProc holder; int endpoint; @@ -96,9 +95,7 @@ void *sp; #elif defined(hpux) void -lwpInitContext(newp, sp) -volatile struct lwpProc *volatile newp; -void *sp; +lwpInitContext(volatile struct lwpProc *volatile newp, void *sp) { static jmp_buf *cpp; extern struct lwpProc *LwpCurrent; @@ -113,8 +110,7 @@ void *sp; } int -lwpSave(jb) -jmp_buf jb; +lwpSave(jmp_buf jb) { /* save stack pointer and return program counter */ asm("stw %sp, 4(%arg0)"); @@ -149,8 +145,7 @@ jmp_buf jb; } void -lwpRestore(jb) -jmp_buf jb; +lwpRestore(jmp_buf jb) { /* restore stack pointer and program counter */ asm volatile ("ldw 4(%arg0), %sp"); @@ -185,9 +180,7 @@ jmp_buf jb; #elif defined(BSD386) void -lwpInitContext(newp, sp) -struct lwpProc *newp; -void *sp; +lwpInitContext(struct lwpProc *newp, void *sp) { newp->context[2] = (int)sp; newp->context[0] = (int)lwpEntryPoint; @@ -196,9 +189,7 @@ void *sp; #elif defined(FBSD) void -lwpInitContext(newp, sp) -struct lwpProc *newp; -void *sp; +lwpInitContext(struct lwpProc *newp, void *sp) { setjmp(newp->context); newp->context->_jb[2] = (int)sp; @@ -209,9 +200,7 @@ void *sp; #elif defined(__linux__) void -lwpInitContext(newp, sp) -struct lwpProc *newp; -void *sp; +lwpInitContext(struct lwpProc *newp, void *sp) { #if defined(__GLIBC__) && (__GLIBC__ >= 2) #if defined(__PPC__) @@ -232,9 +221,7 @@ void *sp; #elif defined(SUN3) void -lwpInitContext(newp, sp) -struct lwpProc *newp; -void *sp; +lwpInitContext(struct lwpProc *newp, void *sp) { newp->context[2] = (int)sp; newp->context[3] = (int)lwpEntryPoint; @@ -245,9 +232,7 @@ void *sp; #include void -lwpInitContext(newp, stack) -struct lwpProc *newp; -void *stack; +lwpInitContext(struct lwpProc *newp, void *stack) { int *sp = (int *)stack; int *fp = 0; @@ -282,8 +267,7 @@ void *stack; } int -lwpSave(jb) -jmp_buf jb; +lwpSave(jmp_buf jb) { asm("movl 4(ap), r0"); /* r0 = &jb */ asm("movl r6, (r0)"); /* jb[0] = r6 */ @@ -298,8 +282,7 @@ jmp_buf jb; } void -lwpRestore(jb) -jmp_buf jb; +lwpRestore(jmp_buf jb) { asm("movl 4(ap), r0"); /* r0 = &jb */ asm("movl (r0), r6"); /* r6 = jb[0] */ @@ -319,9 +302,7 @@ jmp_buf jb; #elif defined(SUN4) void -lwpInitContext(newp, sp) -struct lwpProc *newp; -void *sp; +lwpInitContext(struct lwpProc *newp, void *sp) { static jmp_buf *cpp; extern struct lwpProc *LwpCurrent; @@ -377,9 +358,7 @@ void *sp; */ void -lwpInitContext(newp, sp) -struct lwpProc *newp; -void *sp; +lwpInitContext(struct lwpProc *newp, void *sp) { newp->context[4] = (int)sp; newp->context[5] = (int)lwpEntryPoint; @@ -395,9 +374,7 @@ void *sp; */ void -lwpInitContext(newp, spp) -struct lwpProc *newp; -stack_t *spp; +lwpInitContext(struct lwpProc *newp, stack_t *spp) { getcontext(&(newp->context)); newp->context.uc_stack.ss_sp = spp->ss_sp; @@ -410,9 +387,7 @@ stack_t *spp; #include void -lwpInitContext(newp, sp) -struct lwpProc *newp; -void *sp; +lwpInitContext(struct lwpProc *newp, void *sp) { extern long *_gp; @@ -425,15 +400,13 @@ void *sp; } int -lwpSave(jb) -jmp_buf jb; +lwpSave(jmp_buf jb) { return _setjmp(jb); } void -lwpRestore(jb) -jmp_buf jb; +lwpRestore(jmp_buf jb) { /* resume, but get the pv from the jmp_buf */ asm("ldq %pv, 248(%a0)"); diff --git a/src/lib/lwp/lwp.c b/src/lib/lwp/lwp.c index 3bef1e0c..458271ce 100644 --- a/src/lib/lwp/lwp.c +++ b/src/lib/lwp/lwp.c @@ -58,14 +58,13 @@ static int oldmask; extern char *strdup(); #endif /* NOSTRDUP */ -static void lwpStackCheckInit(); -static int lwpStackCheck(); -static void lwpStackCheckUsed(); +static void lwpStackCheckInit(struct lwpProc *newp); +static int lwpStackCheck(struct lwpProc *newp); +static void lwpStackCheckUsed(struct lwpProc *newp); /* check stack direction */ static int -growsdown(x) -void *x; +growsdown(void *x) { int y; @@ -86,7 +85,7 @@ void *x; * processes here and free them. */ void -lwpReschedule() +lwpReschedule(void) { extern struct lwpQueue LwpSchedQ[]; static int lcount = LCOUNT; @@ -195,9 +194,8 @@ lwpReschedule() * lwpEntryPoint -- process entry point. */ void -lwpEntryPoint() +lwpEntryPoint(void) { - extern struct lwpProc *LwpCurrent; #ifdef POSIXSIGNALS sigset_t set; #endif /* POSIXSIGNALS */ @@ -215,8 +213,7 @@ lwpEntryPoint() *LwpContextPtr = LwpCurrent->ud; lwpStatus(LwpCurrent, "starting at entry point"); - (*LwpCurrent->entry) (LwpCurrent->argc, LwpCurrent->argv, - LwpCurrent->ud); + (*LwpCurrent->entry)(LwpCurrent->ud); lwpExit(); #ifdef BOUNDS_CHECK BOUNDS_CHECKING_ON; @@ -229,18 +226,8 @@ lwpEntryPoint() * lwpCreate -- create a process. */ struct lwpProc * -lwpCreate(priority, entry, size, flags, name, desc, argc, argv, ud) -int priority; -void (*entry) (); -int size; -int flags; -char *name; -char *desc; -int argc; -char *argv[]; -void *ud; +lwpCreate(int priority, void (*entry)(void *), int size, int flags, char *name, char *desc, int argc, char **argv, void *ud) { - extern struct lwpProc *LwpCurrent; struct lwpProc *newp; int *s, x; #ifdef UCONTEXT @@ -329,8 +316,7 @@ void *ud; } void -lwpDestroy(proc) -struct lwpProc *proc; +lwpDestroy(struct lwpProc *proc) { if (proc->flags & LWP_STACKCHECK) { lwpStackCheckUsed(proc); @@ -355,12 +341,8 @@ struct lwpProc *proc; * lwpReady -- put process on ready queue. if null, assume current. */ void -lwpReady(p) -struct lwpProc *p; +lwpReady(struct lwpProc *p) { - extern struct lwpProc *LwpCurrent; - extern struct lwpQueue LwpSchedQ[]; - if (!p) p = LwpCurrent; lwpStatus(p, "added to run queue"); @@ -371,8 +353,7 @@ struct lwpProc *p; * return user's data */ void * -lwpGetUD(p) -struct lwpProc *p; +lwpGetUD(struct lwpProc *p) { if (!p) p = LwpCurrent; @@ -383,9 +364,7 @@ struct lwpProc *p; * set user's data */ void -lwpSetUD(p, ud) -struct lwpProc *p; -char *ud; +lwpSetUD(struct lwpProc *p, char *ud) { if (!p) p = LwpCurrent; @@ -396,10 +375,7 @@ char *ud; * set name & desc */ void -lwpSetDesc(p, name, desc) -struct lwpProc *p; -char *name; -char *desc; +lwpSetDesc(struct lwpProc *p, char *name, char *desc) { if (!p) p = LwpCurrent; @@ -413,7 +389,7 @@ char *desc; * lwpYield -- yield the processor to another thread. */ void -lwpYield() +lwpYield(void) { lwpStatus(LwpCurrent, "yielding control"); lwpReady(LwpCurrent); @@ -424,7 +400,7 @@ lwpYield() * cause the current process to be scheduled for deletion. */ void -lwpExit() +lwpExit(void) { lwpStatus(LwpCurrent, "marking self as dead"); LwpCurrent->dead = 1; @@ -436,8 +412,7 @@ lwpExit() * remove any lingering FD action */ void -lwpTerminate(p) -struct lwpProc *p; +lwpTerminate(struct lwpProc *p) { lwpStatus(p, "terminating process"); p->dead = 1; @@ -450,8 +425,7 @@ struct lwpProc *p; * if the new priority is lower than the old, we reschedule. */ int -lwpSetPriority(new) -int new; +lwpSetPriority(int new) { int old = LwpCurrent->pri; @@ -470,13 +444,8 @@ int new; * initialise the coroutine structures */ struct lwpProc * -lwpInitSystem(pri, ctxptr, flags) -int pri; -char **ctxptr; -int flags; +lwpInitSystem(int pri, char **ctxptr, int flags) { - extern struct lwpQueue LwpSchedQ[]; - extern struct lwpProc *LwpCurrent; struct lwpQueue *q; int i, *stack; struct lwpProc *sel; @@ -517,8 +486,7 @@ int flags; * used. */ static void -lwpStackCheckInit(newp) -struct lwpProc *newp; +lwpStackCheckInit(struct lwpProc *newp) { register int i; register long *lp; @@ -542,8 +510,7 @@ struct lwpProc *newp; * down the entire process. */ static int -lwpStackCheck(newp) -struct lwpProc *newp; +lwpStackCheck(struct lwpProc *newp) { register int end, amt; register unsigned int i; @@ -602,8 +569,7 @@ struct lwpProc *newp; * Figure out how much stack was used by this thread. */ static void -lwpStackCheckUsed(newp) -struct lwpProc *newp; +lwpStackCheckUsed(struct lwpProc *newp) { register int i; register long *lp; diff --git a/src/lib/lwp/lwpint.h b/src/lib/lwp/lwpint.h index 53fc1535..4e356f55 100644 --- a/src/lib/lwp/lwpint.h +++ b/src/lib/lwp/lwpint.h @@ -30,13 +30,13 @@ #define LCOUNT -1 #ifdef hpux -int lwpSave _PROTO((jmp_buf)); -void lwpRestore _PROTO((jmp_buf)); +int lwpSave(jmp_buf); +void lwpRestore(jmp_buf); #endif #if defined(MIPS) || defined(AIX32) || defined(ALPHA) || defined(__vax) -int lwpSave _PROTO((jmp_buf)); -void lwpRestore _PROTO((jmp_buf)); +int lwpSave(jmp_buf); +void lwpRestore(jmp_buf); #elif defined(SUN4) #define lwpSave(x) _setjmp(x) #define lwpRestore(x) _longjmp(x, 1) @@ -78,27 +78,27 @@ typedef struct { #endif /* internal routines */ -void lwpAddTail _PROTO((struct lwpQueue *, struct lwpProc *)); -struct lwpProc *lwpGetFirst _PROTO((struct lwpQueue *)); -void lwpReschedule _PROTO((void)); -void lwpReady _PROTO((struct lwpProc *)); -void lwpOnalarm _PROTO((void)); +void lwpAddTail(struct lwpQueue *, struct lwpProc *); +struct lwpProc *lwpGetFirst(struct lwpQueue *); +void lwpReschedule(void); +void lwpReady(struct lwpProc *); +void lwpOnalarm(void); #ifdef UCONTEXT -void lwpInitContext _PROTO((struct lwpProc *, stack_t *)); +void lwpInitContext(struct lwpProc *, stack_t *); #else /* GETCONTEXT */ #ifdef hpc -void lwpInitContext _PROTO((struct lwpProc *, void *)); +void lwpInitContext(struct lwpProc *, void *); #else #ifdef hpux -void lwpInitContext _PROTO((volatile struct lwpProc * volatile, void *)); +void lwpInitContext(volatile struct lwpProc * volatile, void *); #else -void lwpInitContext _PROTO((struct lwpProc *, void *)); +void lwpInitContext(struct lwpProc *, void *); #endif /* hpux */ #endif /* hpc */ #endif /* GETCONTEXT */ -void lwpEntryPoint _PROTO((void)); -void lwpInitSelect _PROTO((struct lwpProc * self)); -void lwpDestroy _PROTO((struct lwpProc * proc)); +void lwpEntryPoint(void); +void lwpInitSelect(struct lwpProc * self); +void lwpDestroy(struct lwpProc * proc); #endif /* _LWP_H */ diff --git a/src/lib/lwp/misc/lwp.h b/src/lib/lwp/misc/lwp.h index 69fa110a..13d8123f 100644 --- a/src/lib/lwp/misc/lwp.h +++ b/src/lib/lwp/misc/lwp.h @@ -23,14 +23,6 @@ #ifndef _LWP_H #define _LWP_H -#ifndef _PROTO -#ifdef __cplusplus -#define _PROTO(x) x -#else -#define _PROTO(x) () -#endif -#endif - #include #include @@ -67,24 +59,23 @@ struct lwpSem { #define LWP_MAX_PRIO 8 -struct lwpProc *lwpInitSystem _PROTO((int)); -struct lwpProc *lwpCreate -_PROTO((int, void (*)(), int, int, char **, void *)); -void lwpExit _PROTO((void)); -void lwpTerminate _PROTO((struct lwpProc *)); -void lwpYield _PROTO((void)); -void lwpSleepFd _PROTO((int fd, int flags)); -void lwpSleepUntil _PROTO((long until)); -void lwpWakeupFd _PROTO((struct lwpProc *)); -void *lwpGetUD _PROTO((struct lwpProc *)); -void lwpSetUD _PROTO((struct lwpProc *, char *)); -int lwpSetPriority _PROTO((int)); -void lwpReschedule _PROTO(()); +struct lwpProc *lwpInitSystem(int); +struct lwpProc *lwpCreate(int, void (*)(void *), int, int, char **, void *); +void lwpExit(void); +void lwpTerminate(struct lwpProc *); +void lwpYield(void); +void lwpSleepFd(int fd, int flags); +void lwpSleepUntil(long until); +void lwpWakeupFd(struct lwpProc *); +void *lwpGetUD(struct lwpProc *); +void lwpSetUD(struct lwpProc *, char *); +int lwpSetPriority(int); +void lwpReschedule(); -struct lwpSem *lwpCreateSem _PROTO((int)); -void lwpSignal _PROTO((struct lwpSem *)); -void lwpWait _PROTO((struct lwpSem *)); -void lwpSelect _PROTO((int argc, char **argv)); +struct lwpSem *lwpCreateSem(int); +void lwpSignal(struct lwpSem *); +void lwpWait(struct lwpSem *); +void lwpSelect(int argc, char **argv); extern struct lwpProc *LwpCurrent; diff --git a/src/lib/lwp/queue.c b/src/lib/lwp/queue.c index b44e85f9..73e0695d 100644 --- a/src/lib/lwp/queue.c +++ b/src/lib/lwp/queue.c @@ -27,8 +27,7 @@ #if defined(_EMPTH_LWP) struct lwpProc * -lwpGetFirst(q) -struct lwpQueue *q; +lwpGetFirst(struct lwpQueue *q) { struct lwpProc *head; @@ -38,9 +37,7 @@ struct lwpQueue *q; } void -lwpAddTail(q, p) -register struct lwpQueue *q; -register struct lwpProc *p; +lwpAddTail(register struct lwpQueue *q, register struct lwpProc *p) { if (!q->tail) q->head = p; diff --git a/src/lib/lwp/sel.c b/src/lib/lwp/sel.c index 0cc400e4..0e369d2d 100644 --- a/src/lib/lwp/sel.c +++ b/src/lib/lwp/sel.c @@ -62,8 +62,7 @@ struct lwpSelect { struct lwpSelect LwpSelect; void -lwpInitSelect(proc) -struct lwpProc *proc; +lwpInitSelect(struct lwpProc *proc) { LwpSelect.maxfd = 0; LwpSelect.nfds = 0; @@ -82,9 +81,7 @@ struct lwpProc *proc; } void -lwpSleepFd(fd, mask) -int fd; -int mask; +lwpSleepFd(int fd, int mask) { extern struct lwpProc *LwpCurrent; @@ -116,8 +113,7 @@ int mask; } void -lwpWakeupFd(proc) -struct lwpProc *proc; +lwpWakeupFd(struct lwpProc *proc) { if (proc->fd < 0) return; @@ -132,8 +128,7 @@ struct lwpProc *proc; } void -lwpSleepUntil(until) -long until; +lwpSleepUntil(long int until) { extern struct lwpProc *LwpCurrent; @@ -149,9 +144,7 @@ long until; /*ARGSUSED*/ void -lwpSelect(argc, argv) -int argc; -char **argv; +lwpSelect(void *arg) { extern struct lwpProc *LwpCurrent; struct lwpProc *us = LwpCurrent; diff --git a/src/lib/lwp/sem.c b/src/lib/lwp/sem.c index 58867cf2..16147db5 100644 --- a/src/lib/lwp/sem.c +++ b/src/lib/lwp/sem.c @@ -38,9 +38,7 @@ extern char *strdup(); * create a lwpSemaphore. */ struct lwpSem * -lwpCreateSem(name, count) -char *name; -int count; +lwpCreateSem(char *name, int count) { struct lwpSem *new; @@ -57,8 +55,7 @@ int count; * the blocked process has a higher priority than ours'. */ void -lwpSignal(s) -struct lwpSem *s; +lwpSignal(struct lwpSem *s) { extern struct lwpProc *LwpCurrent; @@ -78,8 +75,7 @@ struct lwpSem *s; * wait on a lwpSemaphore */ void -lwpWait(s) -struct lwpSem *s; +lwpWait(struct lwpSem *s) { extern struct lwpProc *LwpCurrent; diff --git a/src/lib/player/empmod.c b/src/lib/player/empmod.c index 9ff92943..3a4ef837 100644 --- a/src/lib/player/empmod.c +++ b/src/lib/player/empmod.c @@ -40,195 +40,195 @@ #include "nat.h" #include "file.h" -extern int add(); -extern int anti(); -extern int assa(); -extern int atta(); -extern int boar(); -extern int bdes(); -extern int bomb(); -extern int buil(); -extern int chan(); -extern int coas(); -extern int comm(); -extern int coun(); -extern int decl(); -extern int deli(); -extern int show(); +extern int add(void); +extern int anti(void); +extern int assa(void); +extern int atta(void); +extern int boar(void); +extern int bdes(void); +extern int bomb(void); +extern int buil(void); +extern int chan(void); +extern int coas(void); +extern int comm(void); +extern int coun(void); +extern int decl(void); +extern int deli(void); +extern int show(void); extern int show_motd(void); -extern int desi(); -extern int diss(); -extern int drop(); +extern int desi(void); +extern int diss(void); +extern int drop(void); extern int echo(void); -extern int enli(); -extern int fire(); -extern int flee(); -extern int fly(); -extern int force(); -extern int info(); -extern int apro(); -extern int load(); -extern int look(); -extern int map(); -extern int mine(); -extern int move(); -extern int nati(); -extern int navi(); -extern int head(), news(); -extern int nuke(); -extern int offs(); -extern int para(); -extern int path(); -extern int payo(); -extern int powe(); -extern int rada(); -extern int rea(); -extern int real(); -extern int reco(); -extern int rout(); -extern int sona(); -extern int spy(); -extern int tele(); -extern int tend(); -extern int torp(); -extern int tran(); -extern int trea(); -extern int turn(); -extern int vers(); +extern int enli(void); +extern int fire(void); +extern int flee(void); +extern int fly(void); +extern int force(void); +extern int info(void); +extern int apro(void); +extern int load(void); +extern int look(void); +extern int map(void); +extern int mine(void); +extern int move(void); +extern int nati(void); +extern int navi(void); +extern int head(void), news(void); +extern int nuke(void); +extern int offs(void); +extern int para(void); +extern int path(void); +extern int payo(void); +extern int powe(void); +extern int rada(void); +extern int rea(void); +extern int real(void); +extern int reco(void); +extern int rout(void); +extern int sona(void); +extern int spy(void); +extern int tele(void); +extern int tend(void); +extern int torp(void); +extern int tran(void); +extern int trea(void); +extern int turn(void); +extern int vers(void); /* * new commands */ -extern int repo(); -extern int laun(); -extern int new(); -extern int shoo(); -extern int thre(); -extern int dist(); -extern int sct(); -extern int plan(); -extern int arm(); -extern int hard(); -extern int upgr(); -extern int surv(); -extern int capi(); -extern int orig(); -extern int conv(); -extern int leve(); -extern int cuto(); -extern int prod(); -extern int wai(); -extern int carg(); -extern int terr(); -extern int sate(); -extern int give(); -extern int edit(); -extern int wipe(); -extern int dump(); -extern int ldump(); -extern int ndump(); -extern int pdump(); -extern int pboa(); -extern int sdump(); -extern int lost(); -extern int explore(); -extern int reso(); -extern int scra(); -extern int rela(); -extern int brea(); -extern int upda(); -extern int hidd(); -extern int orde(); -extern int qorde(); -extern int sorde(); -extern int reje(); -extern int acce(); -extern int sabo(); -extern int scut(); -extern int grin(); -extern int shar(); -extern int sail(); /* Forsman's hacks */ -extern int foll(); -extern int mobq(); -extern int name(); -extern int range(); -extern int zdon(); -extern int fuel(); -extern int multifire(); -extern int retr(); -extern int budg(); -extern int wire(); -extern int stop(); -extern int start(); +extern int repo(void); +extern int laun(void); +extern int new(void); +extern int shoo(void); +extern int thre(void); +extern int dist(void); +extern int sct(void); +extern int plan(void); +extern int arm(void); +extern int hard(void); +extern int upgr(void); +extern int surv(void); +extern int capi(void); +extern int orig(void); +extern int conv(void); +extern int leve(void); +extern int cuto(void); +extern int prod(void); +extern int wai(void); +extern int carg(void); +extern int terr(void); +extern int sate(void); +extern int give(void); +extern int edit(void); +extern int wipe(void); +extern int dump(void); +extern int ldump(void); +extern int ndump(void); +extern int pdump(void); +extern int pboa(void); +extern int sdump(void); +extern int lost(void); +extern int explore(void); +extern int reso(void); +extern int scra(void); +extern int rela(void); +extern int brea(void); +extern int upda(void); +extern int hidd(void); +extern int orde(void); +extern int qorde(void); +extern int sorde(void); +extern int reje(void); +extern int acce(void); +extern int sabo(void); +extern int scut(void); +extern int grin(void); +extern int shar(void); +extern int sail(void); /* Forsman's hacks */ +extern int foll(void); +extern int mobq(void); +extern int name(void); +extern int range(void); +extern int zdon(void); +extern int fuel(void); +extern int multifire(void); +extern int retr(void); +extern int budg(void); +extern int wire(void); +extern int stop(void); +extern int start(void); -extern int land(); -extern int supp(); -extern int lboa(); -extern int lcarg(); -extern int lload(); -extern int army(); -extern int lrange(); -extern int morale(); -extern int lretr(); -extern int landmine(); -extern int fort(); -extern int march(); -extern int llook(); -extern int mission(); -extern int work(); -extern int ltend(); -extern int cede(); -extern int best(); -extern int newe(); -extern int starve(); +extern int land(void); +extern int supp(void); +extern int lboa(void); +extern int lcarg(void); +extern int lload(void); +extern int army(void); +extern int lrange(void); +extern int morale(void); +extern int lretr(void); +extern int landmine(void); +extern int fort(void); +extern int march(void); +extern int llook(void); +extern int mission(void); +extern int work(void); +extern int ltend(void); +extern int cede(void); +extern int best(void); +extern int newe(void); +extern int starve(void); -extern int setres(); -extern int setsector(); +extern int setres(void); +extern int setsector(void); -extern int disa(); -extern int enab(); +extern int disa(void); +extern int enab(void); /* * Undeclared functions */ extern int quit(void); -extern int cens(); -extern int demo(); -extern int shi(); -extern int wing(); +extern int cens(void); +extern int demo(void); +extern int shi(void); +extern int wing(void); extern int execute(void); extern int explain(void); -extern int set(); +extern int set(void); extern int flash(void); -extern int wall(); -extern int shut(); -extern int togg(); -extern int stre(); -extern int skyw(); -extern int play(); -extern int swaps(); +extern int wall(void); +extern int shut(void); +extern int togg(void); +extern int stre(void); +extern int skyw(void); +extern int play(void); +extern int swaps(void); -extern int trad(); -extern int mark(); -extern int buy(); -extern int mult(); -extern int sell(); -extern int rese(); +extern int trad(void); +extern int mark(void); +extern int buy(void); +extern int mult(void); +extern int sell(void); +extern int rese(void); -extern int repa(); -extern int fina(); -extern int coll(); -extern int cons(); -extern int ledg(); -extern int shark(); -extern int offe(); +extern int repa(void); +extern int fina(void); +extern int coll(void); +extern int cons(void); +extern int ledg(void); +extern int shark(void); +extern int offe(void); -extern int mobupdate(); +extern int mobupdate(void); -extern int sinfra(); -extern int improve(); -extern int lsta(); -extern int pstat(); -extern int sstat(); +extern int sinfra(void); +extern int improve(void); +extern int lsta(void); +extern int pstat(void); +extern int sstat(void); struct cmndstr player_coms[] = { /* command form cost addr permit */ diff --git a/src/lib/player/player.c b/src/lib/player/player.c index c90d639a..90ee70af 100644 --- a/src/lib/player/player.c +++ b/src/lib/player/player.c @@ -163,7 +163,6 @@ command(void) { register unsigned int x; s_char *redir; - int kill_player(); s_char scanspace[1024]; if (getcommand(player->combuf) < 0) diff --git a/src/lib/subs/aswplnsubs.c b/src/lib/subs/aswplnsubs.c index a7dc836f..04d02814 100644 --- a/src/lib/subs/aswplnsubs.c +++ b/src/lib/subs/aswplnsubs.c @@ -148,7 +148,6 @@ int print_found(struct shiplook *head) { struct shiplook *s; - extern s_char *effadv(int); int first; struct mchrstr *mp; struct shpstr ship; diff --git a/src/lib/subs/attsub.c b/src/lib/subs/attsub.c index 5a575494..f40a8d84 100644 --- a/src/lib/subs/attsub.c +++ b/src/lib/subs/attsub.c @@ -157,9 +157,7 @@ prcom(int inon, struct combat *com) /* Doing a sneak attack */ static void -do_sneak(def, success) -struct combat *def; -int success; +do_sneak(struct combat *def, int success) { struct sctstr sect; struct natstr *natp = getnatp(player->cnum); @@ -1147,7 +1145,6 @@ att_combat_eff(struct combat *com) { double eff = 1.0; double str; - double sector_strength(struct sctstr *sp); struct shpstr ship; if (com->type == EF_SECTOR) { diff --git a/src/lib/subs/lndsub.c b/src/lib/subs/lndsub.c index d8ac4692..20c5c0ad 100644 --- a/src/lib/subs/lndsub.c +++ b/src/lib/subs/lndsub.c @@ -315,7 +315,6 @@ lnd_take_casualty(int combat_mode, struct llist *llp, int cas) void lnd_takemob(struct emp_qelem *list, double loss) { - extern double combat_mob; struct emp_qelem *qp, *next; struct llist *llp; int new; diff --git a/src/lib/subs/mission.c b/src/lib/subs/mission.c index f6873fa9..1b61462d 100644 --- a/src/lib/subs/mission.c +++ b/src/lib/subs/mission.c @@ -140,7 +140,7 @@ collateral_damage(coord x, coord y, int dam, struct emp_qelem *list) return 0; } -int +static int only_subs(struct emp_qelem *list) { struct emp_qelem *qp; @@ -977,7 +977,6 @@ show_mission(int type, struct nstr_item *np) int oprange(struct genitem *gp, int type, int *radius) { - double techfact(int, double); int range; struct shpstr ship; struct lndstr land; diff --git a/src/lib/subs/move.c b/src/lib/subs/move.c index a405b707..e21e4fa4 100644 --- a/src/lib/subs/move.c +++ b/src/lib/subs/move.c @@ -60,8 +60,7 @@ move_ground(s_char *what, struct sctstr *start, struct sctstr *end, coord curx, cury, oldx, oldy; coord tmpx, tmpy; coord dx, dy; - s_char *movstr, *BestLandPath(s_char *, struct sctstr *, - struct sctstr *, double *, int); + s_char *movstr; double sect_mcost; double total_mcost; double mv_cost; diff --git a/src/lib/subs/retreat.c b/src/lib/subs/retreat.c index 743c1406..a3044000 100644 --- a/src/lib/subs/retreat.c +++ b/src/lib/subs/retreat.c @@ -133,7 +133,6 @@ retreat_ship1(struct shpstr *sp, s_char code, int orig) /* Is this the originally scared ship, or a follower */ { - extern double techfact(int, double); struct sctstr sect; register int n; register int m; @@ -425,7 +424,6 @@ retreat_land1(struct lndstr *lp, s_char code, int orig) /* Is this the originally scared unit, or a follower */ { - extern double techfact(int, double); struct sctstr sect; register int n; register int m; diff --git a/src/lib/subs/show.c b/src/lib/subs/show.c index c1f7ac20..34e5dd65 100644 --- a/src/lib/subs/show.c +++ b/src/lib/subs/show.c @@ -41,6 +41,7 @@ * (bailey@mcs.kent.edu) */ +#include #include "misc.h" #include "player.h" #include "nuke.h" @@ -55,8 +56,6 @@ #include "nat.h" #include "prototypes.h" -double sqrt(double); -double logx(double, double); /* * This cruft really belongs in the empglb.c file. diff --git a/src/lib/subs/shpsub.c b/src/lib/subs/shpsub.c index da0e25aa..a88e1cff 100644 --- a/src/lib/subs/shpsub.c +++ b/src/lib/subs/shpsub.c @@ -380,8 +380,6 @@ shp_mess(s_char *str, struct mlist *mlp) static int shp_check_nav(struct sctstr *sect) { - extern struct dchrstr dchr[]; - switch (dchr[sect->sct_type].d_flg & 03) { case NAVOK: break; diff --git a/src/lib/subs/takeover.c b/src/lib/subs/takeover.c index eb0f4998..d6c6350f 100644 --- a/src/lib/subs/takeover.c +++ b/src/lib/subs/takeover.c @@ -64,7 +64,6 @@ takeover(register struct sctstr *sp, natid newown) struct nstr_item ni; struct plnstr p; struct lndstr land; - extern double hap_fact(struct natstr *, struct natstr *); extern int etu_per_update; extern int sect_mob_neg_factor; diff --git a/src/lib/update/distribute.c b/src/lib/update/distribute.c index 5d198777..9f9ec8ee 100644 --- a/src/lib/update/distribute.c +++ b/src/lib/update/distribute.c @@ -45,14 +45,13 @@ #include "update.h" #include "subs.h" #include "common.h" +#include "prototypes.h" int dodistribute(struct sctstr *sp, int imex, s_char *path, double dist_i_cost, double dist_e_cost) /* import or export? */ { - struct sctstr *getdistsp(); - float distpathcost(); struct ichrstr *ip; struct sctstr *dist; int amt; diff --git a/src/lib/update/finish.c b/src/lib/update/finish.c index 5e555bba..2edf7cfc 100644 --- a/src/lib/update/finish.c +++ b/src/lib/update/finish.c @@ -72,9 +72,9 @@ static s_char *finish_path = "h"; /* Placeholder indicating path exists */ #endif /* SAVE_FINISH_PATHS */ static void assemble_dist_paths(struct distinfo *distptrs); -s_char *BestDistPath(); +s_char *BestDistPath(s_char *, struct sctstr *, struct sctstr *, double *, int); s_char *ReversePath(s_char *path); -double pathcost(); +double pathcost(struct sctstr *, s_char *, int); void finish_sects(int etu) @@ -240,8 +240,7 @@ assemble_dist_paths(struct distinfo *distptrs) } } -s_char -* +s_char * ReversePath(s_char *path) { s_char *patharray = "aucdefjhigklmyopqrstbvwxnz"; diff --git a/src/lib/update/land.c b/src/lib/update/land.c index 9db0d5cd..e78a329b 100644 --- a/src/lib/update/land.c +++ b/src/lib/update/land.c @@ -121,7 +121,6 @@ upd_land(register struct lndstr *lp, int landno, register int etus, int vec[I_MAX + 1]; int cvec[I_MAX + 1]; int n; - double techfact(int, double); int min = morale_base - (int)np->nat_level[NAT_HLEV]; int mult; extern double money_land; @@ -245,7 +244,6 @@ static int landrepair(register struct lndstr *land, int *vec, struct natstr *np, int *bp, int etus) { - extern int mil_dbl_pay; extern int land_grow_scale; register int delta; struct sctstr *sp; diff --git a/src/lib/update/mobility.c b/src/lib/update/mobility.c index 66558913..c2c0c578 100644 --- a/src/lib/update/mobility.c +++ b/src/lib/update/mobility.c @@ -56,7 +56,7 @@ static void do_mob_plane(register struct plnstr *, register int); static void do_mob_sect(register struct sctstr *sp, register int etus); static void do_mob_ship(register struct shpstr *, register int); -int +static int increase_mob(time_t * counter, float mult) { time_t secs; diff --git a/src/lib/update/nav_ship.c b/src/lib/update/nav_ship.c index 61622bee..223942a6 100644 --- a/src/lib/update/nav_ship.c +++ b/src/lib/update/nav_ship.c @@ -241,7 +241,6 @@ nav_loadship(register struct shpstr *sp, natid cnum) int nav_ship(register struct shpstr *sp) { - extern double techfact(int, double); struct sctstr *sectp; s_char *cp, item; int stopping; diff --git a/src/lib/update/nav_util.c b/src/lib/update/nav_util.c index fa3c7097..cc30724b 100644 --- a/src/lib/update/nav_util.c +++ b/src/lib/update/nav_util.c @@ -59,8 +59,6 @@ int check_nav(struct sctstr *sect) { - extern struct dchrstr dchr[]; - switch (dchr[sect->sct_type].d_flg & 03) { case NAVOK: break; diff --git a/src/lib/update/revolt.c b/src/lib/update/revolt.c index 382f6474..9cba5330 100644 --- a/src/lib/update/revolt.c +++ b/src/lib/update/revolt.c @@ -144,7 +144,6 @@ revolt(struct sctstr *sp) void guerrilla(struct sctstr *sp) { - extern s_char *effadv(); struct sctstr *nsp; int recruit; int move; @@ -168,9 +167,7 @@ guerrilla(struct sctstr *sp) int val; int oldmob; struct lndstr *lp; - s_char *nxtitemp(struct nstr_item *np, int owner); struct nstr_item ni; - extern double hap_fact(); mc = cc = 0; recruit = 0; @@ -463,7 +460,6 @@ take_casualties(struct sctstr *sp, int mc) int cantake; int nunits = 0, each, deq; struct lndstr *lp; - s_char *nxtitemp(struct nstr_item *np, int owner); struct nstr_item ni; /* casualties come out of mil first */ diff --git a/src/lib/update/ship.c b/src/lib/update/ship.c index 1190e846..eb474609 100644 --- a/src/lib/update/ship.c +++ b/src/lib/update/ship.c @@ -445,7 +445,6 @@ feed_ship(struct shpstr *sp, register int *vec, int etus, int *needed, int starved, lvec[I_MAX + 1]; struct nstr_item ni; struct lndstr *lp; - s_char *nxtitemp(struct nstr_item *np, int owner); if (opt_NOFOOD) return 0; /* no food no work to do */ diff --git a/src/server/idle.c b/src/server/idle.c index 60b19782..209a605e 100644 --- a/src/server/idle.c +++ b/src/server/idle.c @@ -40,8 +40,7 @@ /*ARGSUSED*/ void -player_kill_idle(argv) -void *argv; +player_kill_idle(void *argv) { extern int max_idle; struct player *p; diff --git a/src/server/lostitem.c b/src/server/lostitem.c index 8dcb1939..d14648e8 100644 --- a/src/server/lostitem.c +++ b/src/server/lostitem.c @@ -43,8 +43,7 @@ /*ARGSUSED*/ void -delete_lostitems(argv) -void *argv; +delete_lostitems(void *argv) { extern int lost_items_timeout; time_t now; diff --git a/src/server/main.c b/src/server/main.c index 1de51efd..d7e780cd 100644 --- a/src/server/main.c +++ b/src/server/main.c @@ -68,10 +68,10 @@ s_char program[] = "server"; -extern void player_accept(); -extern void player_kill_idle(); -extern void update_sched(); -extern void delete_lostitems(); +extern void player_accept(void *); +extern void player_kill_idle(void *); +extern void update_sched(void *); +extern void delete_lostitems(void *); void nullify_objects(void); void init_files(void); void close_files(void); @@ -81,18 +81,16 @@ static void loc_NTInit(void); static void loc_NTTerm(void); #endif -extern void mobility_init(); -extern void mobility_check(); -extern void market_update(); +extern void mobility_init(void); +extern void mobility_check(void *); +extern void market_update(void *); #if !defined(_WIN32) static int mainpid = 0; #endif int -main(argc, argv) -int argc; -char *argv[]; +main(int argc, char **argv) { time_t now; int hour[2]; diff --git a/src/server/marketup.c b/src/server/marketup.c index 1f015eb5..a7d5700b 100644 --- a/src/server/marketup.c +++ b/src/server/marketup.c @@ -42,8 +42,7 @@ /*ARGSUSED*/ void -check_all_markets(argv) -void *argv; +check_all_markets(void *argv) { player->proc = empth_self(); player->cnum = 0; @@ -67,8 +66,7 @@ void *argv; /*ARGSUSED*/ void -market_update(argv) -void *argv; +market_update(void *argv) { time_t now; struct player *dp; diff --git a/src/server/shutdown.c b/src/server/shutdown.c index dcdfd998..53227184 100644 --- a/src/server/shutdown.c +++ b/src/server/shutdown.c @@ -50,9 +50,7 @@ shutdown_init(void) } void -shutdown_sequence(argc, argv) -int argc; -s_char **argv; +shutdown_sequence(void *argv) { struct natstr *god; struct tm *tm; diff --git a/src/server/timestamp.c b/src/server/timestamp.c index 2af831ab..c481297b 100644 --- a/src/server/timestamp.c +++ b/src/server/timestamp.c @@ -42,9 +42,7 @@ /*ARGSUSED*/ void -mobility_check(argv) -void *argv; - +mobility_check(void *argv) { extern s_char *timestampfil; extern int updating_mob; @@ -93,7 +91,7 @@ void *argv; } void -mobility_init() +mobility_init(void) { extern s_char *timestampfil; extern int updating_mob; diff --git a/src/server/update.c b/src/server/update.c index a3f9a8ad..cc2eb587 100644 --- a/src/server/update.c +++ b/src/server/update.c @@ -41,14 +41,13 @@ empth_sem_t *update_sem; -extern void update_main(); -extern void update_wait(); +extern void update_main(void *); +extern void update_wait(void *argv); time_t update_time; /*ARGSUSED*/ void -update_sched(argv) -void *argv; +update_sched(void *argv) { extern int s_p_etu; extern int etu_per_update; @@ -110,8 +109,7 @@ void *argv; /*ARGSUSED*/ void -update_wait(argv) -void *argv; +update_wait(void *argv) { struct player *p; int running; diff --git a/src/util/fairland.c b/src/util/fairland.c index ea243f20..fa9fd328 100644 --- a/src/util/fairland.c +++ b/src/util/fairland.c @@ -87,7 +87,7 @@ static int quiet = 0; #define PLATMIN 36 /* plate altitude for plateau */ #define HIGHMIN 98 /* plate altitude for mountains */ -static void qprint _PROTO((const char *str)); +static void qprint(const char *str); static const char *outfile = "newcap_script"; /* mark the continents with a * so you can tell them @@ -170,10 +170,10 @@ void translate_continents(void); int map_symbol(int x, int y); static void fl_sct_init(coord x, coord y, s_char *ptr); -void print_vars(); +void print_vars(void); void fl_move(int); -void next_coast(); -void grow_islands(); +void next_coast(int c, int x, int y, int *xp, int *yp); +void grow_islands(void); /**************************************************************************** MAIN @@ -262,7 +262,7 @@ main(int argc, char *argv[]) } void -print_vars() +print_vars(void) { if (quiet) return; @@ -279,9 +279,8 @@ print_vars() printf("World dimensions: %dx%d\n", WORLD_X, WORLD_Y); } -int -my_sqrt(n) -int n; +static int +my_sqrt(int n) { int i; @@ -492,9 +491,8 @@ init(void) /* How isolated is capital j? */ -int -iso(j, newx, newy) -int j, newx, newy; +static int +iso(int j, int newx, int newy) { int i, md, d = WORLD_X + WORLD_Y; @@ -550,8 +548,7 @@ stable(void) */ void -fl_move(j) -int j; +fl_move(int j) { int i, n, newx, newy; @@ -573,9 +570,8 @@ int j; /* Look for a coastal sector of continent c */ -void -find_coast(c) -int c; +static void +find_coast(int c) { int i, j; @@ -589,9 +585,8 @@ int c; /* Used for measuring distances */ -int -next_vector(n) -int n; +static int +next_vector(int n) { int i; @@ -608,9 +603,8 @@ int n; /* Test to see if we're allowed to grow there: the arguments di and id */ -int -try_to_grow(c, newx, newy, d) -int c, newx, newy, d; +static int +try_to_grow(int c, int newx, int newy, int d) { int i, j, px, py; @@ -640,8 +634,7 @@ int c, newx, newy, d; */ void -next_coast(c, x, y, xp, yp) -int c, x, y, *xp, *yp; +next_coast(int c, int x, int y, int *xp, int *yp) { int i, nx, ny, wat = 0; @@ -667,7 +660,7 @@ int c, x, y, *xp, *yp; /* Choose a sector to grow from */ -int +static int new_try(int c) { int i, starti; @@ -695,9 +688,8 @@ new_try(int c) /* Grow continent c by 1 sector */ -int -grow_one_sector(c) -int c; +static int +grow_one_sector(int c) { int done, coast_search, try1, x, y, newx, newy, i, n, sx, sy; @@ -774,9 +766,8 @@ grow_continents(void) /* Choose a place to start growing an island from */ -int -place_island(c, xp, yp) -int c, *xp, *yp; +static int +place_island(int c, int *xp, int *yp) { int d, sx, sy; int ssy = rnd(WORLD_Y); @@ -806,7 +797,7 @@ int c, *xp, *yp; */ void -grow_islands() +grow_islands(void) { int c, x, y, isiz; @@ -839,9 +830,8 @@ create_elevations(void) /* Generic function for finding the distance to the closest sea, land, or mountain */ -int -distance_to_what(x, y, flag) -int x, y, flag; +static int +distance_to_what(int x, int y, int flag) { int j, d, px, py; @@ -987,9 +977,8 @@ elevate_sea(void) ADD THE RESOURCES ****************************************************************************/ -int -set_fert(e) -int e; +static int +set_fert(int e) { int fert = 0; if (e < LANDMIN) @@ -1001,9 +990,8 @@ int e; return fert; } -int -set_oil(e) -int e; +static int +set_oil(int e) { int oil = 0; if (e < LANDMIN) @@ -1015,9 +1003,8 @@ int e; return oil; } -int -set_iron(e) -int e; +static int +set_iron(int e) { int iron = 0; if (e >= IRON_MIN && e < HIGHMIN) @@ -1027,9 +1014,8 @@ int e; return iron; } -int -set_gold(e) -int e; +static int +set_gold(int e) { int gold = 0; if (e >= GOLD_MIN) { @@ -1043,9 +1029,8 @@ int e; return gold; } -int -set_uran(e) -int e; +static int +set_uran(int e) { int uran = 0; if (e >= URAN_MIN && e < HIGHMIN) @@ -1055,9 +1040,8 @@ int e; return uran; } -void -add_resources(sct) -struct sctstr *sct; +static void +add_resources(struct sctstr *sct) { sct->sct_fertil = set_fert(sct->sct_elev); sct->sct_oil = set_oil(sct->sct_elev); @@ -1249,8 +1233,7 @@ write_newcap_script(void) } static void -qprint(str) -const char *str; +qprint(const char *str) { if (quiet == 0) fputs(str, stdout); diff --git a/src/util/files.c b/src/util/files.c index ed9c587d..f0eae78c 100644 --- a/src/util/files.c +++ b/src/util/files.c @@ -72,7 +72,6 @@ static void file_sct_init(coord x, coord y, s_char *ptr); int main(int argc, char *argv[]) { - extern s_char *annfil; extern s_char *timestampfil; extern s_char *infodir; extern s_char *commfil; diff --git a/src/util/pconfig.c b/src/util/pconfig.c index 47978250..0c15e8bb 100644 --- a/src/util/pconfig.c +++ b/src/util/pconfig.c @@ -36,9 +36,7 @@ #include "prototypes.h" int -main(argc, argv) -int argc; -char *argv[]; +main(int argc, char **argv) { if (argc > 1) emp_config(argv[1]);