empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
ef_open() already reports failure since commit 7eb2fe57, v4.2.20.
Drop the second report from its callers.
This commit is contained in:
Markus Armbruster 2011-10-29 20:52:33 +02:00
parent f006e373f9
commit 73129c15cc
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/util/fairland.c
View file

@ -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))

4
src/util/files.c
View file

@ -130,11 +130,9 @@ 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);
strcpy(nat.nat_cnam, "POGO");