Split ef_verify() into ef_verify_config(), ef_verify_state()

[empserver] / src / util / empdump.c

diff --git a/src/util/empdump.c b/src/util/empdump.c
index bb42f548e143697e3db188119c51667934b97dec..d2695089bdf8b472aaeef8fccce5212a84972b05 100644 (file)
--- a/src/util/empdump.c
+++ b/src/util/empdump.c
@@ -27,7 +27,7 @@
  *  empdump.c: Export/import Empire game state
  *
  *  Known contributors to this file:
- *     Markus Armbruster, 2008
+ *     Markus Armbruster, 2008-2010
  */
 
 #include <config.h>
@@ -131,10 +131,13 @@ main(int argc, char *argv[])
     global_init();
 
     for (i = 0; i < EF_MAX; i++) {
-       if (!EF_IS_GAME_STATE(i))
-           continue;
-       if (!ef_open(i, EFF_MEM | private, -1))
-           exit(1);
+       if (EF_IS_GAME_STATE(i)) {
+           if (!ef_open(i, EFF_MEM | private))
+               exit(1);
+       } else if (EF_IS_VIEW(i)) {
+           if (ef_open_view(i) < 0)
+               exit(1);
+       }
     }
 
     /* import from IMPORT */
@@ -147,7 +150,9 @@ main(int argc, char *argv[])
            exit(1);
     }
 
-    if (ef_verify() < 0)
+    if (ef_verify_config() < 0)
+       exit(1);
+    if (ef_verify_state(0) < 0)
        exit(1);
 
     /* export to stdout */