(fileinit): Invalid cast sct_init(); a call couldn't possibly work.

Luckily, it isn't called.  Remove.
(ef_fileinit): Unused, remove.

diff --git a/include/file.h b/include/file.h
index f6ea83bb5f030e680c83d548cfbdc159b1977eb9..2e8428b5195b6f9e45da452f01c942595df91862 100644 (file)
--- a/include/file.h
+++ b/include/file.h
@@ -81,8 +81,6 @@ struct empfile {
 #define EF_NMAP         222    /* Kinda bogus, but used to describe a newdesmap
                                   instead of bmap or map. */
 
 #define EF_NMAP         222    /* Kinda bogus, but used to describe a newdesmap
                                   instead of bmap or map. */
 

-typedef void (*ef_fileinit) (int, s_char *);
-

 struct fileinit {
     void (*init) (int, s_char *);
     int (*postread) (int, s_char *);
 struct fileinit {
     void (*init) (int, s_char *);
     int (*postread) (int, s_char *);

diff --git a/src/lib/subs/fileinit.c b/src/lib/subs/fileinit.c
index 52d78a33321b7a0da6303f892202438734e70b78..088aed923808998bb7da621e448523aaa8915dca 100644 (file)
--- a/src/lib/subs/fileinit.c
+++ b/src/lib/subs/fileinit.c
@@ -44,7 +44,7 @@
 #include "optlist.h"
 
 struct fileinit fileinit[EF_MAX] = {
 #include "optlist.h"
 
 struct fileinit fileinit[EF_MAX] = {

-    {(ef_fileinit)sct_init, sct_postread, sct_prewrite, sect_ca},
+    {0, sct_postread, sct_prewrite, sect_ca},

     {shp_init, shp_postread, shp_prewrite, ship_ca},
     {pln_init, pln_postread, pln_prewrite, plane_ca},
     {lnd_init, lnd_postread, lnd_prewrite, land_ca},
     {shp_init, shp_postread, shp_prewrite, ship_ca},
     {pln_init, pln_postread, pln_prewrite, plane_ca},
     {lnd_init, lnd_postread, lnd_prewrite, land_ca},