From bf436a4498d702da1c608a79a1d2db3a09699211 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sun, 31 Aug 2008 14:44:16 -0400
Subject: [PATCH] Change empfile members postread() and prewrite() to return
 void

Callers ignore the value, and callees always return 1.  Pointless.
---
 include/file.h          | 16 +++++++++++++---
 include/prototypes.h    | 20 ++++++++++----------
 src/lib/subs/fileinit.c |  4 ++--
 src/lib/subs/land.c     |  6 ++----
 src/lib/subs/nuke.c     |  7 ++-----
 src/lib/subs/plane.c    |  7 ++-----
 src/lib/subs/sect.c     |  6 ++----
 src/lib/subs/ship.c     |  7 ++-----
 8 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/include/file.h b/include/file.h
index 6dd42dfa6..de7486b41 100644
--- 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 6b74a0eb7..ff085615c 100644
--- 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 5b572d506..b6511df03 100644
--- 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 12f80c28c..3d37b8e5c 100644
--- 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 fe71e7ba9..8a49e7280 100644
--- 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 aaaaf8453..e51ef1a52 100644
--- 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 5674c799f..053214fe5 100644
--- 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 3d0c5bb7d..8501205ab 100644
--- 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 *
-- 
2.43.0