empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

caddr_t is obsolete. Replace by void *, except for struct empfile

Browse source 
member cache, which becomes char * to keep pointer arithmetic simple.
This commit is contained in:
Markus Armbruster 2004-08-23 18:29:44 +00:00
parent 059353e957
commit dcfd251f95
40 changed files with 80 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/commodity.h
View file

@ -52,8 +52,8 @@ struct comstr {
}; };
#define getcomm(n, p) \ #define getcomm(n, p) \
ef_read(EF_COMM, n, (caddr_t)p) ef_read(EF_COMM, n, p)
#define putcomm(n, p) \ #define putcomm(n, p) \
ef_write(EF_COMM, n, (caddr_t)p) ef_write(EF_COMM, n, p)
#endif /* _COMMODITY_H_ */ #endif /* _COMMODITY_H_ */

1
include/common.h
View file

@ -35,7 +35,6 @@
#define _COMMON_H_ #define _COMMON_H_
#include <stdio.h> /* FILE */ #include <stdio.h> /* FILE */
#include <sys/types.h> /* caddr_t */
#include "misc.h" /* s_char coord natid */ #include "misc.h" /* s_char coord natid */
#include "sect.h" /* struct sctstr */ #include "sect.h" /* struct sctstr */
#include "ship.h" /* struct shpstr */ #include "ship.h" /* struct shpstr */

4
include/econfig-spec.h
View file

@ -31,9 +31,9 @@
#if defined(EMP_CONFIG_C_OUTPUT) #if defined(EMP_CONFIG_C_OUTPUT)
#define EMPCFONLYC(fvname, vname, vtype, ctype, num, descr) \ #define EMPCFONLYC(fvname, vname, vtype, ctype, num, descr) \
{ (fvname), (ctype), ((caddr_t)&(vname)), (num), (descr) }, { (fvname), (ctype), &(vname), (num), (descr) },
#define EMPCFBOTH(fvname, vname, vtype, ctype, num, descr) \ #define EMPCFBOTH(fvname, vname, vtype, ctype, num, descr) \
{ (fvname), (ctype), ((caddr_t)&(vname)), (num), (descr) }, { (fvname), (ctype), &(vname), (num), (descr) },
#elif defined(EMP_CONFIG_H_OUTPUT) #elif defined(EMP_CONFIG_H_OUTPUT)

8
include/file.h
View file

@ -50,7 +50,7 @@ struct empfile {
int baseid; /* starting item in cache */ int baseid; /* starting item in cache */
int cids; /* # ids in cache */ int cids; /* # ids in cache */
int csize; /* size of cache in bytes */ int csize; /* size of cache in bytes */
caddr_t cache; /* pointer to cache */ char *cache; /* pointer to cache */
int fids; /* # of ids in file */ int fids; /* # of ids in file */
struct castr *cadef; /* ca defs selection list */ struct castr *cadef; /* ca defs selection list */
}; };
@ -90,7 +90,7 @@ struct fileinit {
}; };
extern struct castr *ef_cadef(int); extern struct castr *ef_cadef(int);
extern int ef_read(int, int, caddr_t); extern int ef_read(int, int, void *);
extern s_char *ef_ptr(int, int); extern s_char *ef_ptr(int, int);
extern s_char *ef_nameof(int); extern s_char *ef_nameof(int);
extern time_t ef_mtime(int); extern time_t ef_mtime(int);
@ -98,7 +98,7 @@ extern int ef_open(int, int, int);
extern int ef_check(int); extern int ef_check(int);
extern int ef_close(int); extern int ef_close(int);
extern int ef_flush(int); extern int ef_flush(int);
extern int ef_write(int, int, caddr_t); extern int ef_write(int, int, void *);
extern int ef_extend(int, int); extern int ef_extend(int, int);
extern int ef_ensure_space(int, int, int); extern int ef_ensure_space(int, int, int);
extern void ef_zapcache(int); extern void ef_zapcache(int);
@ -107,7 +107,7 @@ extern int ef_flags(int);
extern u_short *ef_items(int, void *); extern u_short *ef_items(int, void *);
extern int ef_byname(s_char *); extern int ef_byname(s_char *);
extern int ef_nbread(int type, int id, caddr_t ptr); extern int ef_nbread(int type, int id, void *ptr);
extern struct empfile empfile[]; extern struct empfile empfile[];
#endif /* _FILE_H_ */ #endif /* _FILE_H_ */

4
include/land.h
View file

@ -175,9 +175,9 @@ struct lchrstr {
#define LND_SPY_DETECT_CHANCE(eff) ((110-(eff))/100.0) #define LND_SPY_DETECT_CHANCE(eff) ((110-(eff))/100.0)
#define getland(n, p) \ #define getland(n, p) \
ef_read(EF_LAND, n, (caddr_t)p) ef_read(EF_LAND, n, p)
#define putland(n, p) \ #define putland(n, p) \
ef_write(EF_LAND, n, (caddr_t)p) ef_write(EF_LAND, n, p)
#define getlandp(n) \ #define getlandp(n) \
(struct lndstr *) ef_ptr(EF_LAND, n) (struct lndstr *) ef_ptr(EF_LAND, n)

4
include/loan.h
View file

@ -57,9 +57,9 @@ struct lonstr {
#define LS_SIGNED 2 #define LS_SIGNED 2
#define getloan(n, lp) \ #define getloan(n, lp) \
ef_read(EF_LOAN, n, (caddr_t)lp) ef_read(EF_LOAN, n, lp)
#define putloan(n, lp) \ #define putloan(n, lp) \
ef_write(EF_LOAN, n, (caddr_t)lp) ef_write(EF_LOAN, n, lp)
#define getloanp(n) \ #define getloanp(n) \
(struct lonstr *) ef_ptr(EF_LOAN, n) (struct lonstr *) ef_ptr(EF_LOAN, n)

4
include/lost.h
View file

@ -44,8 +44,8 @@ struct loststr {
time_t lost_timestamp; /* When it was lost */ time_t lost_timestamp; /* When it was lost */
}; };
#define getlost(n, p) ef_read(EF_LOST, n, (caddr_t)p) #define getlost(n, p) ef_read(EF_LOST, n, p)
#define putlost(n, p) ef_write(EF_LOST, n, (caddr_t)p) #define putlost(n, p) ef_write(EF_LOST, n, p)
/* src/lib/subs/lostsub.c */ /* src/lib/subs/lostsub.c */
extern int findlost(char, natid, short, coord, coord, int); extern int findlost(char, natid, short, coord, coord, int);

1
include/misc.h
View file

@ -42,7 +42,6 @@
#if defined(_WIN32) #if defined(_WIN32)
typedef unsigned char u_char; typedef unsigned char u_char;
typedef unsigned short u_short; typedef unsigned short u_short;
typedef char *caddr_t;
typedef unsigned int u_int; typedef unsigned int u_int;
/* integral mismatch, due to misuse of sector short */ /* integral mismatch, due to misuse of sector short */

2
include/nat.h
View file

@ -142,7 +142,7 @@ extern s_char *relates[];
/* procedures relating to nation stuff */ /* procedures relating to nation stuff */
#define putnat(n) \ #define putnat(n) \
ef_write(EF_NATION, n->nat_cnum, (caddr_t)n) ef_write(EF_NATION, n->nat_cnum, n)
#define getnatp(n) \ #define getnatp(n) \
(struct natstr *) ef_ptr(EF_NATION, (int)n) (struct natstr *) ef_ptr(EF_NATION, (int)n)

4
include/news.h
View file

@ -160,9 +160,9 @@ struct rptstr {
#define NEWS_PERIOD days(10) #define NEWS_PERIOD days(10)
#define getnews(n, p) \ #define getnews(n, p) \
ef_read(EF_NEWS, n, (caddr_t)p) ef_read(EF_NEWS, n, p)
#define putnews(n, p) \ #define putnews(n, p) \
ef_write(EF_NEWS, n, (caddr_t)p) ef_write(EF_NEWS, n, p)
#define getnewsp(n) \ #define getnewsp(n) \
(struct nwsstr *) ef_ptr(EF_NEWS, n) (struct nwsstr *) ef_ptr(EF_NEWS, n)

4
include/nsc.h
View file

@ -134,7 +134,7 @@ struct nstr_sect {
struct range range; /* area of coverage */ struct range range; /* area of coverage */
int dist; /* dist query: range */ int dist; /* dist query: range */
coord cx, cy; /* dist query: center x-y */ coord cx, cy; /* dist query: center x-y */
int (*read)(int type, int id, caddr_t ptr); /* read function */ int (*read)(int type, int id, void *ptr); /* read function */
int ncond; /* # of selection conditions */ int ncond; /* # of selection conditions */
struct nscstr cond[NS_NCOND]; /* selection conditions */ struct nscstr cond[NS_NCOND]; /* selection conditions */
}; };
@ -152,7 +152,7 @@ struct nstr_item {
int size; /* NS_LIST: size of list */ int size; /* NS_LIST: size of list */
int index; /* NS_LIST: index */ int index; /* NS_LIST: index */
int list[NS_LSIZE]; /* NS_LIST: item list */ int list[NS_LSIZE]; /* NS_LIST: item list */
int (*read)(int type, int id, caddr_t ptr); /* read function */ int (*read)(int type, int id, void *ptr); /* read function */
int flags; /* ef_flags(TYPE) */ int flags; /* ef_flags(TYPE) */
int ncond; /* # of selection conditions */ int ncond; /* # of selection conditions */
struct nscstr cond[NS_NCOND]; /* selection conditions */ struct nscstr cond[NS_NCOND]; /* selection conditions */

4
include/nuke.h
View file

@ -66,9 +66,9 @@ struct nchrstr {
#define N_NEUT bit(0) /* Neutron bomb (low damage, high fallout) */ #define N_NEUT bit(0) /* Neutron bomb (low damage, high fallout) */
#define getnuke(n, p) \ #define getnuke(n, p) \
ef_read(EF_NUKE, n, (caddr_t)p) ef_read(EF_NUKE, n, p)
#define putnuke(n, p) \ #define putnuke(n, p) \
ef_write(EF_NUKE, n, (caddr_t)p) ef_write(EF_NUKE, n, p)
#define getnukep(n) \ #define getnukep(n) \
(struct nukstr *) ef_ptr(EF_NUKE, n) (struct nukstr *) ef_ptr(EF_NUKE, n)

2
include/optlist.h
View file

@ -113,7 +113,7 @@ struct keymatch {
s_char *km_key; /* the key */ s_char *km_key; /* the key */
void (*km_func)(struct keymatch * kp, s_char **av); void (*km_func)(struct keymatch * kp, s_char **av);
/* the function to call if matches */ /* the function to call if matches */
caddr_t km_data; /* associated data */ void *km_data; /* associated data */
int km_flags; /* useful flags */ int km_flags; /* useful flags */
#define KM_ALLOC 0x01 /* memory allocated */ #define KM_ALLOC 0x01 /* memory allocated */
s_char *km_comment; /* Comment (hopefully useful) */ s_char *km_comment; /* Comment (hopefully useful) */

4
include/plane.h
View file

@ -141,9 +141,9 @@ struct plist {
#define P_DEL 2 #define P_DEL 2
#define getplane(n, p) \ #define getplane(n, p) \
ef_read(EF_PLANE, n, (caddr_t)p) ef_read(EF_PLANE, n, p)
#define putplane(n, p) \ #define putplane(n, p) \
ef_write(EF_PLANE, n, (caddr_t)p) ef_write(EF_PLANE, n, p)
#define getplanep(n) \ #define getplanep(n) \
(struct plnstr *) ef_ptr(EF_PLANE, n) (struct plnstr *) ef_ptr(EF_PLANE, n)

4
include/power.h
View file

@ -56,9 +56,9 @@ struct powstr {
}; };
#define getpower(n, p) \ #define getpower(n, p) \
ef_read(EF_POWER, n, (caddr_t)p) ef_read(EF_POWER, n, p)
#define putpower(n, p) \ #define putpower(n, p) \
ef_write(EF_POWER, n, (caddr_t)p) ef_write(EF_POWER, n, p)
#define getpowerp(n) \ #define getpowerp(n) \
(struct powstr *) ef_ptr(EF_POWER, n) (struct powstr *) ef_ptr(EF_POWER, n)

4
include/prototypes.h
View file

@ -76,7 +76,7 @@ extern void resnoise(struct sctstr *sptr, int public_amt, s_char *name,
int old, int new); int old, int new);
extern int line_of_sight(char **rad, int ax, int ay, int bx, int by); extern int line_of_sight(char **rad, int ax, int ay, int bx, int by);
extern void plane_sona(struct emp_qelem *, int, int, struct shiplook *); extern void plane_sona(struct emp_qelem *, int, int, struct shiplook *);
extern int tend_nxtitem(struct nstr_item *, caddr_t); extern int tend_nxtitem(struct nstr_item *, void *);
extern s_char *prsub(struct shpstr *); extern s_char *prsub(struct shpstr *);
extern int check_trade(void); extern int check_trade(void);
extern int ontradingblock(int, int *); extern int ontradingblock(int, int *);
@ -373,7 +373,7 @@ extern void nuk_init(int, s_char *);
extern void nuk_add(coord, coord, int, int); extern void nuk_add(coord, coord, int, int);
extern void nuk_delete(struct nukstr *, int, int); extern void nuk_delete(struct nukstr *, int, int);
/* nxtitem.c */ /* nxtitem.c */
extern int nxtitem(struct nstr_item *, caddr_t); extern int nxtitem(struct nstr_item *, void *);
/* nxtsct.c */ /* nxtsct.c */
extern int nxtsct(register struct nstr_sect *, struct sctstr *); extern int nxtsct(register struct nstr_sect *, struct sctstr *);
/* plane.c */ /* plane.c */

4
include/sect.h
View file

@ -150,10 +150,10 @@ struct dchrstr {
#define SCT_MAXDEF 34 /* highest sector type in header files */ #define SCT_MAXDEF 34 /* highest sector type in header files */
#define getsect(x, y, p) \ #define getsect(x, y, p) \
ef_read(EF_SECTOR, sctoff((int) x, (int) y), (caddr_t)p) ef_read(EF_SECTOR, sctoff((int) x, (int) y), p)
#define putsect(p) \ #define putsect(p) \
ef_write(EF_SECTOR, sctoff((int) (p)->sct_x, \ ef_write(EF_SECTOR, sctoff((int) (p)->sct_x, \
(int) (p)->sct_y), (caddr_t)p) (int) (p)->sct_y), p)
#define getsectp(x, y) \ #define getsectp(x, y) \
(struct sctstr *) ef_ptr(EF_SECTOR, sctoff((int)x, (int)y)) (struct sctstr *) ef_ptr(EF_SECTOR, sctoff((int)x, (int)y))
#define getsectid(id) \ #define getsectid(id) \

4
include/ship.h
View file

@ -177,9 +177,9 @@ struct mchrstr {
#define M_ANTIMISSILE bit(20) /* Shoot down missile */ #define M_ANTIMISSILE bit(20) /* Shoot down missile */
#define getship(n, p) \ #define getship(n, p) \
ef_read(EF_SHIP, n, (caddr_t)p) ef_read(EF_SHIP, n, p)
#define putship(n, p) \ #define putship(n, p) \
ef_write(EF_SHIP, n, (caddr_t)p) ef_write(EF_SHIP, n, p)
#define getshipp(n) \ #define getshipp(n) \
(struct shpstr *) ef_ptr(EF_SHIP, n) (struct shpstr *) ef_ptr(EF_SHIP, n)

4
include/trade.h
View file

@ -82,9 +82,9 @@ extern long get_outstand(int);
extern double loan_owed(struct lonstr *loan, time_t paytime); extern double loan_owed(struct lonstr *loan, time_t paytime);
#define gettrade(n, p) \ #define gettrade(n, p) \
ef_read(EF_TRADE, n, (caddr_t)p) ef_read(EF_TRADE, n, p)
#define puttrade(n, p) \ #define puttrade(n, p) \
ef_write(EF_TRADE, n, (caddr_t)p) ef_write(EF_TRADE, n, p)
#define gettradep(n) \ #define gettradep(n) \
(struct trdstr *) ef_ptr(EF_TRADE, n) (struct trdstr *) ef_ptr(EF_TRADE, n)

4
include/treaty.h
View file

@ -71,9 +71,9 @@ struct tchrstr {
/* global treaty variables */ /* global treaty variables */
#define gettre(n, p) \ #define gettre(n, p) \
ef_read(EF_TREATY, n, (caddr_t)p) ef_read(EF_TREATY, n, p)
#define puttre(n, p) \ #define puttre(n, p) \
ef_write(EF_TREATY, n, (caddr_t)p) ef_write(EF_TREATY, n, p)
#define gettrep(n) \ #define gettrep(n) \
(struct trtstr *) ef_ptr(EF_TREATY, n) (struct trtstr *) ef_ptr(EF_TREATY, n)

10
src/lib/commands/cede.c
View file

@ -213,7 +213,7 @@ grab_sect(register struct sctstr *sp, natid to)
pp = &p; pp = &p;
snxtitem_xy(&ni, EF_PLANE, sp->sct_x, sp->sct_y); snxtitem_xy(&ni, EF_PLANE, sp->sct_x, sp->sct_y);
while (nxtitem(&ni, (caddr_t)pp)) { while (nxtitem(&ni, pp)) {
if (pp->pln_own == 0) if (pp->pln_own == 0)
continue; continue;
if (pp->pln_ship >= 0) if (pp->pln_ship >= 0)
@ -236,7 +236,7 @@ grab_sect(register struct sctstr *sp, natid to)
np = &nuk; np = &nuk;
snxtitem_xy(&ni, EF_NUKE, sp->sct_x, sp->sct_y); snxtitem_xy(&ni, EF_NUKE, sp->sct_x, sp->sct_y);
while (nxtitem(&ni, (caddr_t)np)) { while (nxtitem(&ni, np)) {
if (np->nuk_own == 0) if (np->nuk_own == 0)
continue; continue;
@ -251,7 +251,7 @@ grab_sect(register struct sctstr *sp, natid to)
lp = &l; lp = &l;
snxtitem_xy(&ni, EF_LAND, sp->sct_x, sp->sct_y); snxtitem_xy(&ni, EF_LAND, sp->sct_x, sp->sct_y);
while (nxtitem(&ni, (caddr_t)lp)) { while (nxtitem(&ni, lp)) {
if (lp->lnd_own == 0) if (lp->lnd_own == 0)
continue; continue;
if (lp->lnd_ship == 0) if (lp->lnd_ship == 0)
@ -342,7 +342,7 @@ grab_ship(register struct shpstr *sp, natid to)
pp = &p; pp = &p;
snxtitem_xy(&ni, EF_PLANE, sp->shp_x, sp->shp_y); snxtitem_xy(&ni, EF_PLANE, sp->shp_x, sp->shp_y);
while (nxtitem(&ni, (caddr_t)pp)) { while (nxtitem(&ni, pp)) {
if (pp->pln_own == 0) if (pp->pln_own == 0)
continue; continue;
if (pp->pln_flags & PLN_LAUNCHED) if (pp->pln_flags & PLN_LAUNCHED)
@ -365,7 +365,7 @@ grab_ship(register struct shpstr *sp, natid to)
lp = &l; lp = &l;
snxtitem_xy(&ni, EF_LAND, sp->shp_x, sp->shp_y); snxtitem_xy(&ni, EF_LAND, sp->shp_x, sp->shp_y);
while (nxtitem(&ni, (caddr_t)lp)) { while (nxtitem(&ni, lp)) {
if (lp->lnd_own == 0) if (lp->lnd_own == 0)
continue; continue;
if (lp->lnd_ship != sp->shp_uid) if (lp->lnd_ship != sp->shp_uid)

4
src/lib/commands/cons.c
View file

@ -144,7 +144,7 @@ cons_choose(struct ltcomstr *ltcp)
sprintf(prompt, "%s number? ", ltcp->Name); sprintf(prompt, "%s number? ", ltcp->Name);
if ((ltcp->num = onearg(player->argp[2], prompt)) < 0) if ((ltcp->num = onearg(player->argp[2], prompt)) < 0)
return RET_SYN; return RET_SYN;
if (!ef_read(ltcp->type, ltcp->num, (caddr_t)&ltcp->u) || if (!ef_read(ltcp->type, ltcp->num, &ltcp->u) ||
!(ltcp->type == EF_TREATY !(ltcp->type == EF_TREATY
? distrea(ltcp->num, &ltcp->u.t) ? distrea(ltcp->num, &ltcp->u.t)
: disloan(ltcp->num, &ltcp->u.l))) { : disloan(ltcp->num, &ltcp->u.l))) {
@ -204,7 +204,7 @@ loan_accept(struct ltcomstr *ltcp)
pr("%s %d is still pending.\n", ltcp->Name, ltcp->num); pr("%s %d is still pending.\n", ltcp->Name, ltcp->num);
return RET_OK; return RET_OK;
} }
if (!getloan(ltcp->num, (caddr_t)lp)) { if (!getloan(ltcp->num, lp)) {
pr("loan_accept: can't read loan; get help!\n"); pr("loan_accept: can't read loan; get help!\n");
return RET_SYS; return RET_SYS;
} }

2
src/lib/commands/fina.c
View file

@ -64,7 +64,7 @@ fina(void)
prdate(); prdate();
pr("Loan From To Rate Dur Paid Total\n"); pr("Loan From To Rate Dur Paid Total\n");
snxtitem(&ni, EF_LOAN, "*"); snxtitem(&ni, EF_LOAN, "*");
while (nxtitem(&ni, (caddr_t)&loan)) { while (nxtitem(&ni, &loan)) {
if (loan.l_status != LS_SIGNED) if (loan.l_status != LS_SIGNED)
continue; continue;
pr(" %-2d (%3d) %-8.8s (%3d) %-8.8s ", ni.cur, pr(" %-2d (%3d) %-8.8s (%3d) %-8.8s ", ni.cur,

2
src/lib/commands/laun.c
View file

@ -205,7 +205,7 @@ launch_as(struct plnstr *pp)
} }
goodtarget = 0; goodtarget = 0;
snxtitem_dist(&ni, EF_PLANE, sx, sy, 0); snxtitem_dist(&ni, EF_PLANE, sx, sy, 0);
while (!goodtarget && nxtitem(&ni, (caddr_t)&plane)) { while (!goodtarget && nxtitem(&ni, &plane)) {
if (!plane.pln_own) if (!plane.pln_own)
continue; continue;
if (!(plane.pln_flags & PLN_LAUNCHED)) if (!(plane.pln_flags & PLN_LAUNCHED))

4
src/lib/commands/mfir.c
View file

@ -786,7 +786,7 @@ quiet_bigdef(int attacker, struct emp_qelem *list, natid own, natid aown,
return 0; return 0;
dam = 0; dam = 0;
snxtitem_dist(&ni, EF_SHIP, ax, ay, 8); snxtitem_dist(&ni, EF_SHIP, ax, ay, 8);
while (nxtitem(&ni, (caddr_t)&ship)) { while (nxtitem(&ni, &ship)) {
if (ship.shp_own == 0) if (ship.shp_own == 0)
continue; continue;
@ -874,7 +874,7 @@ quiet_bigdef(int attacker, struct emp_qelem *list, natid own, natid aown,
} }
} }
snxtitem_dist(&ni, EF_LAND, ax, ay, 8); snxtitem_dist(&ni, EF_LAND, ax, ay, 8);
while (nxtitem(&ni, (caddr_t)&land)) { while (nxtitem(&ni, &land)) {
if (land.lnd_own == 0) if (land.lnd_own == 0)
continue; continue;
if (land.lnd_effic < LAND_MINFIREEFF) if (land.lnd_effic < LAND_MINFIREEFF)

2
src/lib/commands/sona.c
View file

@ -159,7 +159,7 @@ sona(void)
} }
memset(visbuf, 0, (WORLD_Y * (WORLD_X + 1))); memset(visbuf, 0, (WORLD_Y * (WORLD_X + 1)));
snxtitem_dist(&nit, EF_SHIP, ship.shp_x, ship.shp_y, range); snxtitem_dist(&nit, EF_SHIP, ship.shp_x, ship.shp_y, range);
while (nxtitem(&nit, (caddr_t)&targ)) { while (nxtitem(&nit, &targ)) {
if (targ.shp_own == player->cnum || targ.shp_own == 0) if (targ.shp_own == player->cnum || targ.shp_own == 0)
continue; continue;

2
src/lib/commands/tend.c
View file

@ -207,7 +207,7 @@ expose_ship(struct shpstr *s1, struct shpstr *s2)
*/ */
int int
tend_nxtitem(struct nstr_item *np, caddr_t ptr) tend_nxtitem(struct nstr_item *np, void *ptr)
{ {
struct genitem *gp; struct genitem *gp;
int selected; int selected;

2
src/lib/commands/tran.c
View file

@ -111,7 +111,7 @@ tran_nuke(void)
snxtitem_xy(&nstr, EF_NUKE, sect.sct_x, sect.sct_y); snxtitem_xy(&nstr, EF_NUKE, sect.sct_x, sect.sct_y);
#endif #endif
found = 0; found = 0;
while (nxtitem(&nstr, (caddr_t)&nuke)) { while (nxtitem(&nstr, &nuke)) {
if (player->owner) { if (player->owner) {
found = 1; found = 1;
break; break;

10
src/lib/common/file.c
View file

@ -171,10 +171,10 @@ ef_ptr(int type, int id)
* This system won't work if item size is > sizeof buffer area. * This system won't work if item size is > sizeof buffer area.
*/ */
int int
ef_read(int type, int id, caddr_t ptr) ef_read(int type, int id, void *ptr)
{ {
register struct empfile *ep; register struct empfile *ep;
caddr_t from; void *from;
if (ef_check(type) < 0) if (ef_check(type) < 0)
return 0; return 0;
@ -219,7 +219,7 @@ fillcache(struct empfile *ep, int start)
* zaps read cache * zaps read cache
*/ */
int int
ef_nbread(int type, int id, caddr_t ptr) ef_nbread(int type, int id, void *ptr)
{ {
register struct empfile *ep; register struct empfile *ep;
int r; int r;
@ -256,7 +256,7 @@ ef_nbread(int type, int id, caddr_t ptr)
* and writes through to disk. * and writes through to disk.
*/ */
int int
ef_write(int type, int id, caddr_t ptr) ef_write(int type, int id, void *ptr)
{ {
register int r; register int r;
register struct empfile *ep; register struct empfile *ep;
@ -310,7 +310,7 @@ ef_write(int type, int id, caddr_t ptr)
* zaps read cache * zaps read cache
*/ */
int int
ef_nbwrite(int type, int id, caddr_t ptr) ef_nbwrite(int type, int id, void *ptr)
{ {
register struct empfile *ep; register struct empfile *ep;
register int r; register int r;

6
src/lib/common/maps.c
View file

@ -178,7 +178,7 @@ draw_map(int bmap, s_char origin, int map_flags, struct nstr_sect *nsp,
return RET_OK; return RET_OK;
if (map_flags & MAP_PLANE) { if (map_flags & MAP_PLANE) {
snxtitem_all(&ni, EF_PLANE); snxtitem_all(&ni, EF_PLANE);
while (nxtitem(&ni, (caddr_t)&plane)) { while (nxtitem(&ni, &plane)) {
if (plane.pln_own == 0) if (plane.pln_own == 0)
continue; continue;
if (plane.pln_own != player->cnum && !player->god) if (plane.pln_own != player->cnum && !player->god)
@ -193,7 +193,7 @@ draw_map(int bmap, s_char origin, int map_flags, struct nstr_sect *nsp,
} }
if (map_flags & MAP_SHIP) { if (map_flags & MAP_SHIP) {
snxtitem_all(&ni, EF_SHIP); snxtitem_all(&ni, EF_SHIP);
while (nxtitem(&ni, (caddr_t)&ship)) { while (nxtitem(&ni, &ship)) {
if (ship.shp_own == 0) if (ship.shp_own == 0)
continue; continue;
if (ship.shp_own != player->cnum && !player->god) if (ship.shp_own != player->cnum && !player->god)
@ -208,7 +208,7 @@ draw_map(int bmap, s_char origin, int map_flags, struct nstr_sect *nsp,
} }
if (map_flags & MAP_LAND) { if (map_flags & MAP_LAND) {
snxtitem_all(&ni, EF_LAND); snxtitem_all(&ni, EF_LAND);
while (nxtitem(&ni, (caddr_t)&land)) { while (nxtitem(&ni, &land)) {
if (land.lnd_own == 0) if (land.lnd_own == 0)
continue; continue;
if (land.lnd_own != player->cnum && !player->god) if (land.lnd_own != player->cnum && !player->god)

8
src/lib/subs/detonate.c
View file

@ -146,7 +146,7 @@ detonate(struct plnstr *pp, int x, int y)
} }
} }
snxtitem_dist(&ni, EF_PLANE, x, y, rad); snxtitem_dist(&ni, EF_PLANE, x, y, rad);
while (nxtitem(&ni, (caddr_t)&plane)) { while (nxtitem(&ni, &plane)) {
/* Nukes falling on water affect only 1 sector */ /* Nukes falling on water affect only 1 sector */
if ((plane.pln_x != x) && issea) if ((plane.pln_x != x) && issea)
continue; continue;
@ -197,7 +197,7 @@ detonate(struct plnstr *pp, int x, int y)
putplane(ni.cur, &plane); putplane(ni.cur, &plane);
} }
snxtitem_dist(&ni, EF_LAND, x, y, rad); snxtitem_dist(&ni, EF_LAND, x, y, rad);
while (nxtitem(&ni, (caddr_t)&land)) { while (nxtitem(&ni, &land)) {
/* Nukes falling on water affect only 1 sector */ /* Nukes falling on water affect only 1 sector */
if ((land.lnd_x != x) && issea) if ((land.lnd_x != x) && issea)
continue; continue;
@ -244,7 +244,7 @@ detonate(struct plnstr *pp, int x, int y)
putland(land.lnd_uid, &land); putland(land.lnd_uid, &land);
} }
snxtitem_dist(&ni, EF_SHIP, x, y, rad); snxtitem_dist(&ni, EF_SHIP, x, y, rad);
while (nxtitem(&ni, (caddr_t)&ship)) { while (nxtitem(&ni, &ship)) {
/* Nukes falling on water affect only 1 sector */ /* Nukes falling on water affect only 1 sector */
if ((ship.shp_x != x) && issea) if ((ship.shp_x != x) && issea)
continue; continue;
@ -285,7 +285,7 @@ detonate(struct plnstr *pp, int x, int y)
putship(ship.shp_uid, &ship); putship(ship.shp_uid, &ship);
} }
snxtitem_dist(&ni, EF_NUKE, x, y, rad); snxtitem_dist(&ni, EF_NUKE, x, y, rad);
while (nxtitem(&ni, (caddr_t)&nuke)) { while (nxtitem(&ni, &nuke)) {
/* Nukes falling on water affect only 1 sector */ /* Nukes falling on water affect only 1 sector */
if ((nuke.nuk_x != x) && issea) if ((nuke.nuk_x != x) && issea)
continue; continue;

2
src/lib/subs/fortdef.c
View file

@ -82,7 +82,7 @@ sd(natid att, natid own, coord x, coord y, int noisy, int defending,
return 0; return 0;
eff = 1.0; eff = 1.0;
snxtitem_dist(&ni, EF_SHIP, x, y, 8); snxtitem_dist(&ni, EF_SHIP, x, y, 8);
while (nxtitem(&ni, (caddr_t)&ship) && eff > 0.30) { while (nxtitem(&ni, &ship) && eff > 0.30) {
if (ship.shp_own == att) if (ship.shp_own == att)
continue; continue;
if (ship.shp_own == 0) if (ship.shp_own == 0)

2
src/lib/subs/nxtitem.c
View file

@ -46,7 +46,7 @@
#include "prototypes.h" #include "prototypes.h"
int int
nxtitem(struct nstr_item *np, caddr_t ptr) nxtitem(struct nstr_item *np, void *ptr)
{ {
struct genitem *gp; struct genitem *gp;
int selected; int selected;

2
src/lib/subs/nxtsct.c
View file

@ -70,7 +70,7 @@ nxtsct(register struct nstr_sect *np, struct sctstr *sp)
continue; continue;
} }
np->id = sctoff(np->x, np->y); np->id = sctoff(np->x, np->y);
if (!np->read(EF_SECTOR, np->id, (caddr_t)sp)) if (!np->read(EF_SECTOR, np->id, sp))
continue; continue;
if (np->ncond == 0) if (np->ncond == 0)
return 1; return 1;

4
src/lib/subs/radmap.c
View file

@ -136,7 +136,7 @@ radmap2(int owner,
if (!pr_flag) if (!pr_flag)
return; return;
snxtitem_dist(&ni, EF_PLANE, cx, cy, range); snxtitem_dist(&ni, EF_PLANE, cx, cy, range);
while (nxtitem(&ni, (caddr_t)&plane)) { while (nxtitem(&ni, &plane)) {
if (plane.pln_own == 0) if (plane.pln_own == 0)
continue; continue;
/* Used to have 'ghosts' when scanning whole world --ts */ /* Used to have 'ghosts' when scanning whole world --ts */
@ -149,7 +149,7 @@ radmap2(int owner,
} }
} }
snxtitem_dist(&ni, EF_SHIP, cx, cy, range); snxtitem_dist(&ni, EF_SHIP, cx, cy, range);
while (nxtitem(&ni, (caddr_t)&ship)) { while (nxtitem(&ni, &ship)) {
if (ship.shp_own == 0) if (ship.shp_own == 0)
continue; continue;
/* Used to have 'ghosts' when scanning whole world --ts */ /* Used to have 'ghosts' when scanning whole world --ts */

8
src/lib/subs/satmap.c
View file

@ -159,7 +159,7 @@ satmap(int x, int y, int eff, int range, int flags, int type)
pr(" own shp# ship type sector eff\n"); pr(" own shp# ship type sector eff\n");
} }
} }
while (nxtitem(&ni, (caddr_t)&ship)) { while (nxtitem(&ni, &ship)) {
if (ship.shp_own == 0) if (ship.shp_own == 0)
continue; continue;
if ((mchr[(int)ship.shp_type].m_flags & M_SUB) && if ((mchr[(int)ship.shp_type].m_flags & M_SUB) &&
@ -214,7 +214,7 @@ satmap(int x, int y, int eff, int range, int flags, int type)
prdate(); prdate();
pr(" own lnd# unit type sector eff\n"); pr(" own lnd# unit type sector eff\n");
} }
while (nxtitem(&ni, (caddr_t)&land)) { while (nxtitem(&ni, &land)) {
if (land.lnd_own == 0) if (land.lnd_own == 0)
continue; continue;
if (!chance((double)land.lnd_effic / 20.0)) if (!chance((double)land.lnd_effic / 20.0))
@ -308,7 +308,7 @@ satdisp(struct sctstr *sp, int acc, int showstuff)
return; return;
snxtitem_xy(&ni, EF_SHIP, sp->sct_x, sp->sct_y); snxtitem_xy(&ni, EF_SHIP, sp->sct_x, sp->sct_y);
first = 1; first = 1;
while (nxtitem(&ni, (caddr_t)&ship)) { while (nxtitem(&ni, &ship)) {
if (ship.shp_own == 0) if (ship.shp_own == 0)
continue; continue;
if (mchr[(int)ship.shp_type].m_flags & M_SUB) if (mchr[(int)ship.shp_type].m_flags & M_SUB)
@ -335,7 +335,7 @@ satdisp(struct sctstr *sp, int acc, int showstuff)
snxtitem_xy(&ni, EF_LAND, sp->sct_x, sp->sct_y); snxtitem_xy(&ni, EF_LAND, sp->sct_x, sp->sct_y);
first = 1; first = 1;
while (nxtitem(&ni, (caddr_t)&land)) { while (nxtitem(&ni, &land)) {
if (land.lnd_own == 0) if (land.lnd_own == 0)
continue; continue;
if (!chance((double)land.lnd_effic / 20.0)) if (!chance((double)land.lnd_effic / 20.0))

2
src/lib/subs/shpsub.c
View file

@ -932,7 +932,7 @@ shp_missile_defense(coord dx, coord dy, natid bombown, int hardtarget)
snxtitem_dist(&ni, EF_SHIP, dx, dy, 1); snxtitem_dist(&ni, EF_SHIP, dx, dy, 1);
while (nxtitem(&ni, (caddr_t)&ship)) { while (nxtitem(&ni, &ship)) {
if (!ship.shp_own) if (!ship.shp_own)
continue; continue;

12
src/lib/subs/takeover.c
View file

@ -71,7 +71,7 @@ takeover(register struct sctstr *sp, natid newown)
pp = &p; pp = &p;
/* Take over planes */ /* Take over planes */
snxtitem_dist(&ni, EF_PLANE, sp->sct_x, sp->sct_y, 0); snxtitem_dist(&ni, EF_PLANE, sp->sct_x, sp->sct_y, 0);
while (nxtitem(&ni, (caddr_t)pp)) { while (nxtitem(&ni, pp)) {
if (pp->pln_own != sp->sct_own) if (pp->pln_own != sp->sct_own)
continue; continue;
takeover_plane(pp, newown); takeover_plane(pp, newown);
@ -80,7 +80,7 @@ takeover(register struct sctstr *sp, natid newown)
/* Take over land units */ /* Take over land units */
lp = &land; lp = &land;
snxtitem_dist(&ni, EF_LAND, sp->sct_x, sp->sct_y, 0); snxtitem_dist(&ni, EF_LAND, sp->sct_x, sp->sct_y, 0);
while (nxtitem(&ni, (caddr_t)lp)) { while (nxtitem(&ni, lp)) {
if ((lp->lnd_own == newown) || (lp->lnd_own == 0)) if ((lp->lnd_own == newown) || (lp->lnd_own == 0))
continue; continue;
if (lp->lnd_own != sp->sct_own) if (lp->lnd_own != sp->sct_own)
@ -232,7 +232,7 @@ takeover_ship(register struct shpstr *sp, natid newown, int hostile)
lp = &llp; lp = &llp;
/* Take over planes */ /* Take over planes */
snxtitem_all(&ni, EF_PLANE); snxtitem_all(&ni, EF_PLANE);
while (nxtitem(&ni, (caddr_t)pp)) { while (nxtitem(&ni, pp)) {
if (pp->pln_ship != sp->shp_uid) if (pp->pln_ship != sp->shp_uid)
continue; continue;
if (pp->pln_own == 0) if (pp->pln_own == 0)
@ -255,7 +255,7 @@ takeover_ship(register struct shpstr *sp, natid newown, int hostile)
} }
/* Take over land units */ /* Take over land units */
snxtitem_all(&ni, EF_LAND); snxtitem_all(&ni, EF_LAND);
while (nxtitem(&ni, (caddr_t)lp)) { while (nxtitem(&ni, lp)) {
if (lp->lnd_ship != sp->shp_uid) if (lp->lnd_ship != sp->shp_uid)
continue; continue;
if (lp->lnd_own == 0) if (lp->lnd_own == 0)
@ -295,7 +295,7 @@ takeover_land(register struct lndstr *landp, natid newown, int hostile)
lp = &llp; lp = &llp;
/* Take over planes */ /* Take over planes */
snxtitem_all(&ni, EF_PLANE); snxtitem_all(&ni, EF_PLANE);
while (nxtitem(&ni, (caddr_t)pp)) { while (nxtitem(&ni, pp)) {
if (pp->pln_land != landp->lnd_uid) if (pp->pln_land != landp->lnd_uid)
continue; continue;
if (pp->pln_own == 0) if (pp->pln_own == 0)
@ -318,7 +318,7 @@ takeover_land(register struct lndstr *landp, natid newown, int hostile)
} }
/* Take over land units */ /* Take over land units */
snxtitem_all(&ni, EF_LAND); snxtitem_all(&ni, EF_LAND);
while (nxtitem(&ni, (caddr_t)lp)) { while (nxtitem(&ni, lp)) {
if (lp->lnd_land != landp->lnd_uid) if (lp->lnd_land != landp->lnd_uid)
continue; continue;
if (lp->lnd_own == 0) if (lp->lnd_own == 0)

2
src/lib/subs/wu.c
View file

@ -144,7 +144,7 @@ typed_wu(natid from, natid to, s_char *message, int type)
tel.tel_length = len; tel.tel_length = len;
tel.tel_type = type; tel.tel_type = type;
#if !defined(_WIN32) #if !defined(_WIN32)
iov[0].iov_base = (caddr_t)&tel; iov[0].iov_base = &tel;
iov[0].iov_len = sizeof(tel); iov[0].iov_len = sizeof(tel);
iov[1].iov_base = message; iov[1].iov_base = message;
iov[1].iov_len = len; iov[1].iov_len = len;

2
src/scripts/indent-emp
View file

@ -2,7 +2,7 @@
# indent needs to know type names do to a proper job. # indent needs to know type names do to a proper job.
# Type names located with grep typedef, then extracted by hand: # Type names located with grep typedef, then extracted by hand:
types="caddr_t coord empth_sem_t empth_t loc_Sem_t loc_Thread_t natid ns_seltype nsc_cat nsc_flags nsc_type packed_nsc_cat packed_nsc_type qsort_func_t s_char stkalign_t u_char u_int u_short" types="coord empth_sem_t empth_t loc_Sem_t loc_Thread_t natid ns_seltype nsc_cat nsc_flags nsc_type packed_nsc_cat packed_nsc_type qsort_func_t s_char stkalign_t u_char u_int u_short"
opts="-kr -cdw -cp8 -ncs -psl -ss" opts="-kr -cdw -cp8 -ncs -psl -ss"
for t in $types for t in $types