From 73129c15cc659e8c039152630b12f38a6e3b34ca Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 29 Oct 2011 20:52:33 +0200 Subject: [PATCH] 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. --- src/util/fairland.c | 4 +--- src/util/files.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) 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); -- 2.43.0