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) \
ef_read(EF_COMM, n, (caddr_t)p)
ef_read(EF_COMM, n, p)
#define putcomm(n, p) \
ef_write(EF_COMM, n, (caddr_t)p)
ef_write(EF_COMM, n, p)
#endif /* _COMMODITY_H_ */

1
include/common.h
View file

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

4
include/econfig-spec.h
View file

@ -31,9 +31,9 @@
#if defined(EMP_CONFIG_C_OUTPUT)
#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) \
{ (fvname), (ctype), ((caddr_t)&(vname)), (num), (descr) },
{ (fvname), (ctype), &(vname), (num), (descr) },
#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 cids; /* # ids in cache */
int csize; /* size of cache in bytes */
caddr_t cache; /* pointer to cache */
char *cache; /* pointer to cache */
int fids; /* # of ids in file */
struct castr *cadef; /* ca defs selection list */
};
@ -90,7 +90,7 @@ struct fileinit {
};
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_nameof(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_close(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_ensure_space(int, int, int);
extern void ef_zapcache(int);
@ -107,7 +107,7 @@ extern int ef_flags(int);
extern u_short *ef_items(int, void *);
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[];
#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 getland(n, p) \
ef_read(EF_LAND, n, (caddr_t)p)
ef_read(EF_LAND, n, p)
#define putland(n, p) \
ef_write(EF_LAND, n, (caddr_t)p)
ef_write(EF_LAND, n, p)
#define getlandp(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 getloan(n, lp) \
ef_read(EF_LOAN, n, (caddr_t)lp)
ef_read(EF_LOAN, n, lp)
#define putloan(n, lp) \
ef_write(EF_LOAN, n, (caddr_t)lp)
ef_write(EF_LOAN, n, lp)
#define getloanp(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 */
};
#define getlost(n, p) ef_read(EF_LOST, n, (caddr_t)p)
#define putlost(n, p) ef_write(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, p)
/* src/lib/subs/lostsub.c */
extern int findlost(char, natid, short, coord, coord, int);

1
include/misc.h
View file

@ -42,7 +42,6 @@
#if defined(_WIN32)
typedef unsigned char u_char;
typedef unsigned short u_short;
typedef char *caddr_t;
typedef unsigned int u_int;
/* 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 */
#define putnat(n) \
ef_write(EF_NATION, n->nat_cnum, (caddr_t)n)
ef_write(EF_NATION, n->nat_cnum, n)
#define getnatp(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 getnews(n, p) \
ef_read(EF_NEWS, n, (caddr_t)p)
ef_read(EF_NEWS, n, p)
#define putnews(n, p) \
ef_write(EF_NEWS, n, (caddr_t)p)
ef_write(EF_NEWS, n, p)
#define getnewsp(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 */
int dist; /* dist query: range */
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 */
struct nscstr cond[NS_NCOND]; /* selection conditions */
};
@ -152,7 +152,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)(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 ncond; /* # of 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 getnuke(n, p) \
ef_read(EF_NUKE, n, (caddr_t)p)
ef_read(EF_NUKE, n, p)
#define putnuke(n, p) \
ef_write(EF_NUKE, n, (caddr_t)p)
ef_write(EF_NUKE, n, p)
#define getnukep(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 */
void (*km_func)(struct keymatch * kp, s_char **av);
/* the function to call if matches */
caddr_t km_data; /* associated data */
void *km_data; /* associated data */
int km_flags; /* useful flags */
#define KM_ALLOC 0x01 /* memory allocated */
s_char *km_comment; /* Comment (hopefully useful) */

4
include/plane.h
View file

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

4
include/power.h
View file

@ -56,9 +56,9 @@ struct powstr {
};
#define getpower(n, p) \
ef_read(EF_POWER, n, (caddr_t)p)
ef_read(EF_POWER, n, p)
#define putpower(n, p) \
ef_write(EF_POWER, n, (caddr_t)p)
ef_write(EF_POWER, n, p)
#define getpowerp(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);
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 int tend_nxtitem(struct nstr_item *, caddr_t);
extern int tend_nxtitem(struct nstr_item *, void *);
extern s_char *prsub(struct shpstr *);
extern int check_trade(void);
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_delete(struct nukstr *, int, int);
/* nxtitem.c */
extern int nxtitem(struct nstr_item *, caddr_t);
extern int nxtitem(struct nstr_item *, void *);
/* nxtsct.c */
extern int nxtsct(register struct nstr_sect *, struct sctstr *);
/* 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 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) \
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) \
(struct sctstr *) ef_ptr(EF_SECTOR, sctoff((int)x, (int)y))
#define getsectid(id) \

4
include/ship.h
View file

@ -177,9 +177,9 @@ struct mchrstr {
#define M_ANTIMISSILE bit(20) /* Shoot down missile */
#define getship(n, p) \
ef_read(EF_SHIP, n, (caddr_t)p)
ef_read(EF_SHIP, n, p)
#define putship(n, p) \
ef_write(EF_SHIP, n, (caddr_t)p)
ef_write(EF_SHIP, n, p)
#define getshipp(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);
#define gettrade(n, p) \
ef_read(EF_TRADE, n, (caddr_t)p)
ef_read(EF_TRADE, n, p)
#define puttrade(n, p) \
ef_write(EF_TRADE, n, (caddr_t)p)
ef_write(EF_TRADE, n, p)
#define gettradep(n) \
(struct trdstr *) ef_ptr(EF_TRADE, n)

4
include/treaty.h
View file

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