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

Callers ignore the value, and callees always return 1.  Pointless.

diff --git a/include/file.h b/include/file.h
index 6dd42dfa6096730e5faf56ae4365bf5425c4f773..de7486b41fbffffb53352d6bd8c3e36f762895ea 100644 (file)
--- a/include/file.h
+++ b/include/file.h
@@ -59,9 +59,19 @@ struct empfile {
     int fd;                    /* file descriptor, -1 if not open */
     /* flags bits EFF_PRIVATE, EFF_CUSTOM also vary */
 
-    /* User callbacks */
-    int (*postread)(int, void *); /* called after read, unless null */
-    int (*prewrite)(int, void *); /* called before write, unless null */
+    /* User callbacks, may all be null */
+    /*
+     * Called after read, with file type and element as arguments.
+     * May modify the element.  Modifications are visible to caller of
+     * ef_read(), but have no effect on the file.
+     */
+    void (*postread)(int, void *);
+    /*
+     * Called before write, with file type and element as arguments.
+     * May modify the element.  Modifications will be visible to
+     * caller of ef_write() and are written to the file.
+     */
+    void (*prewrite)(int, void *);
 };
 
 struct emptypedstr {

diff --git a/include/prototypes.h b/include/prototypes.h
index 6b74a0eb76810889d3702bd9dd5193ce8ca6a28d..ff085615c4082aec5e6f5918db1f2c4da8df90b9 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -450,8 +450,8 @@ extern void bitinit2(struct nstr_sect *, unsigned char *, int);
 extern int getele(char *, char *);
 /* land.c */
 extern char *prland(struct lndstr *);
-extern int lnd_postread(int, void *);
-extern int lnd_prewrite(int, void *);
+extern void lnd_postread(int, void *);
+extern void lnd_prewrite(int, void *);
 /* landgun.c */
 extern double seagun(int, int);
 extern double fortgun(int, int);
@@ -517,8 +517,8 @@ extern void init_nreport(void);
 extern void nreport(natid, int, natid, int);
 /* nuke.c */
 extern char *prnuke(struct nukstr *);
-extern int nuk_postread(int, void *);
-extern int nuk_prewrite(int, void *);
+extern void nuk_postread(int, void *);
+extern void nuk_prewrite(int, void *);
 extern int nuk_on_plane(struct nukstr *, int);
 /* nxtitem.c */
 extern int nxtitem(struct nstr_item *, void *);
@@ -528,8 +528,8 @@ extern int nxtsct(struct nstr_sect *, struct sctstr *);
 extern int onearg(char *, char *);
 /* plane.c */
 extern char *prplane(struct plnstr *);
-extern int pln_postread(int, void *);
-extern int pln_prewrite(int, void *);
+extern void pln_postread(int, void *);
+extern void pln_prewrite(int, void *);
 /* plnsub.c */
 extern void count_planes(struct shpstr *);
 extern int get_planes(struct nstr_item *, struct nstr_item *,
@@ -618,8 +618,8 @@ extern void satdisp_units(coord, coord);
 extern void satmap(int, int, int, int, int, int);
 extern void sathead(void);
 /* sect.c */
-extern int sct_postread(int, void *);
-extern int sct_prewrite(int, void *);
+extern void sct_postread(int, void *);
+extern void sct_prewrite(int, void *);
 extern void item_prewrite(short *);
 extern int issector(char *);
 /* sectdamage.c */
@@ -627,8 +627,8 @@ extern int sect_damage(struct sctstr *, int);
 extern int sectdamage(struct sctstr *, int);
 /* ship.c */
 extern char *prship(struct shpstr *);
-extern int shp_postread(int, void *);
-extern int shp_prewrite(int, void *);
+extern void shp_postread(int, void *);
+extern void shp_prewrite(int, void *);
 /* show.c */
 extern void show_bridge(int);
 extern void show_tower(int);

diff --git a/src/lib/subs/fileinit.c b/src/lib/subs/fileinit.c
index 5b572d5069ea1f79d0ef0a965cc3345ffe390d09..b6511df03d512e2174d3d286cfe6766cccb7aa27 100644 (file)
--- a/src/lib/subs/fileinit.c
+++ b/src/lib/subs/fileinit.c
@@ -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[] = {

diff --git a/src/lib/subs/land.c b/src/lib/subs/land.c
index 12f80c28c41d4c4f708a7be3bf5b150e3f814aa2..3d37b8e5c76f149f50ce3248900b70e8ea54719a 100644 (file)
--- a/src/lib/subs/land.c
+++ b/src/lib/subs/land.c
@@ -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 *

diff --git a/src/lib/subs/nuke.c b/src/lib/subs/nuke.c
index fe71e7ba9aa9229ba2ee5b6430a44dcc066e7d4c..8a49e7280a0cc44409997288ff73ede0c176fe35 100644 (file)
--- a/src/lib/subs/nuke.c
+++ b/src/lib/subs/nuke.c
@@ -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

diff --git a/src/lib/subs/plane.c b/src/lib/subs/plane.c
index aaaaf8453cb8eda9f71b4bd2647f63eabdf35719..e51ef1a52c21c232b80ac27d254c60537b6b75f7 100644 (file)
--- a/src/lib/subs/plane.c
+++ b/src/lib/subs/plane.c
@@ -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 *

diff --git a/src/lib/subs/sect.c b/src/lib/subs/sect.c
index 5674c799ff0e8630e9408997de502ead77b62d2a..053214fe5658dc01e827efd53d3f9620a974a8ea 100644 (file)
--- a/src/lib/subs/sect.c
+++ b/src/lib/subs/sect.c
@@ -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

diff --git a/src/lib/subs/ship.c b/src/lib/subs/ship.c
index 3d0c5bb7d5f6d08695e0038a492e3111245a016d..8501205ab3438f183548180232f4ac170184746d 100644 (file)
--- a/src/lib/subs/ship.c
+++ b/src/lib/subs/ship.c
@@ -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 *