From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 29 Oct 2011 18:52:33 +0000 (+0200)
Subject: Fix files and fairland to report ef_open() failure just once
X-Git-Tag: v4.3.29~41
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=73129c15cc659e8c039152630b12f38a6e3b34ca

Fix files and fairland to report ef_open() failure just once

ef_open() already reports failure since commit 7eb2fe57, v4.2.20.
Drop the second report from its callers.
---

diff --git a/src/util/fairland.c b/src/util/fairland.c
index fcaf94f75..069796e70 100644
--- a/src/util/fairland.c
+++ b/src/util/fairland.c
@@ -260,10 +260,8 @@ main(int argc, char *argv[])
 	fprintf(stderr, "Can't chdir to %s (%s)\n", gamedir, strerror(errno));
 	exit(EXIT_FAILURE);
     }
-    if (!ef_open(EF_SECTOR, EFF_MEM | EFF_NOTIME)) {
-	perror("ef_open");
+    if (!ef_open(EF_SECTOR, EFF_MEM | EFF_NOTIME))
 	exit(1);
-    }
     write_sects();
     qprint("writing to sectors file...\n");
     if (!ef_close(EF_SECTOR))
diff --git a/src/util/files.c b/src/util/files.c
index 10bf5d2fb..c76d6d4f6 100644
--- a/src/util/files.c
+++ b/src/util/files.c
@@ -130,10 +130,8 @@ main(int argc, char *argv[])
     for (i = 0; i < EF_MAX; i++) {
 	if (!EF_IS_GAME_STATE(i))
 	    continue;
-	if (!ef_open(i, EFF_CREATE | EFF_NOTIME)) {
-	    perror("ef_open");
+	if (!ef_open(i, EFF_CREATE | EFF_NOTIME))
 	    exit(1);
-	}
     }
 
     ef_read(EF_NATION, 0, &nat);