Change empfile members postread() and prewrite() to return void

Callers ignore the value, and callees always return 1.  Pointless.
This commit is contained in:
Markus Armbruster 2008-08-31 14:44:16 -04:00
parent e438f6b4cd
commit bf436a4498
8 changed files with 35 additions and 38 deletions

View file

@ -41,8 +41,8 @@
struct fileinit {
int ef_type;
int (*postread) (int, void *);
int (*prewrite) (int, void *);
void (*postread) (int, void *);
void (*prewrite) (int, void *);
};
static struct fileinit fileinit[] = {

View file

@ -44,7 +44,7 @@
#include "prototypes.h"
#include "ship.h"
int
void
lnd_postread(int n, void *ptr)
{
struct lndstr *llp = ptr;
@ -106,10 +106,9 @@ lnd_postread(int n, void *ptr)
lnd_do_upd_mob(llp);
player->owner = (player->god || llp->lnd_own == player->cnum);
return 1;
}
int
void
lnd_prewrite(int n, void *ptr)
{
struct lndstr *llp = ptr;
@ -154,7 +153,6 @@ lnd_prewrite(int n, void *ptr)
getland(n, &land);
}
return 1;
}
char *

View file

@ -47,7 +47,7 @@
#include "sect.h"
#include "xy.h"
int
void
nuk_postread(int n, void *ptr)
{
struct nukstr *np = ptr;
@ -71,10 +71,9 @@ nuk_postread(int n, void *ptr)
}
player->owner = (player->god || np->nuk_own == player->cnum);
return 1;
}
int
void
nuk_prewrite(int n, void *ptr)
{
struct nukstr *np = ptr;
@ -89,8 +88,6 @@ nuk_prewrite(int n, void *ptr)
}
getnuke(n, &nuke);
return 1;
}
int

View file

@ -45,7 +45,7 @@
#include "prototypes.h"
#include "ship.h"
int
void
pln_postread(int n, void *ptr)
{
struct plnstr *pp = ptr;
@ -105,10 +105,9 @@ pln_postread(int n, void *ptr)
player->owner = (player->god || pp->pln_own == player->cnum);
if (opt_MOB_ACCESS)
pln_do_upd_mob(pp);
return 1;
}
int
void
pln_prewrite(int n, void *ptr)
{
struct plnstr *pp = ptr;
@ -132,8 +131,6 @@ pln_prewrite(int n, void *ptr)
}
}
getplane(n, &plane);
return 1;
}
char *

View file

@ -50,7 +50,7 @@
static int checksect(struct sctstr *);
int
void
sct_postread(int id, void *ptr)
{
struct sctstr *sp = ptr;
@ -59,10 +59,9 @@ sct_postread(int id, void *ptr)
player->owner = (player->god || sp->sct_own == player->cnum);
if (opt_MOB_ACCESS)
sct_do_upd_mob(sp);
return 1;
}
int
void
sct_prewrite(int id, void *ptr)
{
struct sctstr *sp = ptr;
@ -71,7 +70,6 @@ sct_prewrite(int id, void *ptr)
bridge_damaged(sp);
checksect(sp);
getsect(sp->sct_x, sp->sct_y, &sect);
return 1;
}
void

View file

@ -45,7 +45,7 @@
#include "prototypes.h"
#include "ship.h"
int
void
shp_postread(int n, void *ptr)
{
struct shpstr *sp = ptr;
@ -59,10 +59,9 @@ shp_postread(int n, void *ptr)
if (opt_MOB_ACCESS)
shp_do_upd_mob(sp);
player->owner = (player->god || sp->shp_own == player->cnum);
return 1;
}
int
void
shp_prewrite(int n, void *ptr)
{
struct shpstr *sp = ptr;
@ -100,8 +99,6 @@ shp_prewrite(int n, void *ptr)
item_prewrite(sp->shp_item);
getship(n, &ship);
}
return 1;
}
char *