Clean up initialization of nat_ca[]

[empserver] / src / lib / subs / fileinit.c

diff --git a/src/lib/subs/fileinit.c b/src/lib/subs/fileinit.c
index 8af390d2dc7d9e2785eae16572c3f467bb61783c..6fc7b37dc12801ad3020392e1d36a325f3019f9d 100644 (file)
--- a/src/lib/subs/fileinit.c
+++ b/src/lib/subs/fileinit.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
@@ -29,17 +29,18 @@
  * 
  *  Known contributors to this file:
  *     Ron Koenderink, 2005
- *  
  */
 
+#include <config.h>
+
 #include "file.h"
 #include "prototypes.h"
 
 struct fileinit {
     int ef_type;
-    void (*init) (int, char *);
-    int (*postread) (int, char *);
-    int (*prewrite) (int, char *);
+    void (*init) (int, void *);
+    int (*postread) (int, void *);
+    int (*prewrite) (int, void *);
 };
 
 static struct fileinit fileinit[] = {
@@ -52,27 +53,24 @@ static struct fileinit fileinit[] = {
 
 static void ef_open_srv(void);
 static void ef_close_srv(void);
+static int ef_init_view(int, int);
+static void ef_fina_view(int);
 
 /*
  * Initialize empfile for full server operations.
- * Like ef_init(), but additionally installs the server's callbacks.
- * This is separate from ef_init(), so that utility programs like
- * files can use empfile.
  */
 void
 ef_init_srv(void)
 {
     unsigned i;
 
-    ef_init();
-    if (ef_load() < 0)
-       exit(EXIT_FAILURE);
-
     for (i = 0; i < sizeof(fileinit) / sizeof(fileinit[0]); i++) {
        empfile[fileinit[i].ef_type].init = fileinit[i].init;
        empfile[fileinit[i].ef_type].postread = fileinit[i].postread;
        empfile[fileinit[i].ef_type].prewrite = fileinit[i].prewrite;
     }
+
+    nsc_init();
     ef_open_srv();
     if (ef_verify() < 0)
        exit(EXIT_FAILURE);
@@ -89,11 +87,13 @@ static void
 ef_open_srv(void)
 {
     int failed = 0;
+
     failed |= !ef_open(EF_NATION, EFF_MEM);
     failed |= !ef_open(EF_SECTOR, EFF_MEM);
     failed |= !ef_open(EF_SHIP, EFF_MEM);
     failed |= !ef_open(EF_PLANE, EFF_MEM);
     failed |= !ef_open(EF_LAND, EFF_MEM);
+    failed |= !ef_open(EF_GAME, EFF_MEM);
     failed |= !ef_open(EF_NEWS, 0);
     failed |= !ef_open(EF_LOAN, 0);
     failed |= !ef_open(EF_TREATY, 0);
@@ -104,6 +104,9 @@ ef_open_srv(void)
     failed |= !ef_open(EF_BMAP, EFF_MEM);
     failed |= !ef_open(EF_COMM, 0);
     failed |= !ef_open(EF_LOST, 0);
+    failed |= !ef_open(EF_REALM, EFF_MEM);
+    if (!failed)
+       failed |= ef_init_view(EF_COUNTRY, EF_NATION);
     if (failed) {
        logerror("Missing files, giving up");
        exit(EXIT_FAILURE);
@@ -113,11 +116,13 @@ ef_open_srv(void)
 static void
 ef_close_srv(void)
 {
+    ef_fina_view(EF_COUNTRY);
     ef_close(EF_NATION);
     ef_close(EF_SECTOR);
     ef_close(EF_SHIP);
     ef_close(EF_PLANE);
     ef_close(EF_LAND);
+    ef_close(EF_GAME);
     ef_close(EF_NEWS);
     ef_close(EF_LOAN);
     ef_close(EF_TREATY);
@@ -128,4 +133,25 @@ ef_close_srv(void)
     ef_close(EF_COMM);
     ef_close(EF_BMAP);
     ef_close(EF_LOST);
+    ef_close(EF_REALM);
+}
+
+static int
+ef_init_view(int type, int base)
+{
+    if (CANT_HAPPEN(!(empfile[base].flags & EFF_MEM)))
+       return -1;
+    empfile[type].cache = empfile[base].cache;
+    empfile[type].csize = empfile[base].csize;
+    empfile[type].flags |= EFF_MEM;
+    empfile[type].baseid = empfile[base].baseid;
+    empfile[type].cids = empfile[base].cids;
+    empfile[type].fids = empfile[base].fids;
+    return 0;
+}
+
+static void
+ef_fina_view(int type)
+{
+    empfile[type].cache = NULL;
 }