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

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.
*/
int
ef_read(int type, int id, caddr_t ptr)
ef_read(int type, int id, void *ptr)
{
register struct empfile *ep;
caddr_t from;
void *from;
if (ef_check(type) < 0)
return 0;
@ -219,7 +219,7 @@ fillcache(struct empfile *ep, int start)
* zaps read cache
*/
int
ef_nbread(int type, int id, caddr_t ptr)
ef_nbread(int type, int id, void *ptr)
{
register struct empfile *ep;
int r;
@ -256,7 +256,7 @@ ef_nbread(int type, int id, caddr_t ptr)
* and writes through to disk.
*/
int
ef_write(int type, int id, caddr_t ptr)
ef_write(int type, int id, void *ptr)
{
register int r;
register struct empfile *ep;
@ -310,7 +310,7 @@ ef_write(int type, int id, caddr_t ptr)
* zaps read cache
*/
int
ef_nbwrite(int type, int id, caddr_t ptr)
ef_nbwrite(int type, int id, void *ptr)
{
register struct empfile *ep;
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;
if (map_flags & MAP_PLANE) {
snxtitem_all(&ni, EF_PLANE);
while (nxtitem(&ni, (caddr_t)&plane)) {
while (nxtitem(&ni, &plane)) {
if (plane.pln_own == 0)
continue;
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) {
snxtitem_all(&ni, EF_SHIP);
while (nxtitem(&ni, (caddr_t)&ship)) {
while (nxtitem(&ni, &ship)) {
if (ship.shp_own == 0)
continue;
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) {
snxtitem_all(&ni, EF_LAND);
while (nxtitem(&ni, (caddr_t)&land)) {
while (nxtitem(&ni, &land)) {
if (land.lnd_own == 0)
continue;
if (land.lnd_own != player->cnum && !player->god)