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

fairland: Consistent error message format

Browse source 
fairland prefixes error messages with several variations of "fairland:
error -- ", but also with "ERROR: " and nothing at all.  Consistently
prefix them with just the program name.

Some error messages end with a period, most don't.  Drop the periods.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2020-07-26 13:15:03 +02:00
parent 9c07d02519
commit c206fe83c2
1 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/util/fairland.c
View file

@ -299,8 +299,8 @@ main(int argc, char *argv[])
grow_continents(); grow_continents();
} while (fl_status && ++i < NUMTRIES); } while (fl_status && ++i < NUMTRIES);
if (fl_status) { if (fl_status) {
fputs("ERROR: World not large enough to hold continents\n", fprintf(stderr, "%s: world not large enough to hold continents\n",
stderr); program_name);
exit(1); exit(1);
} }
qprint("growing islands:"); qprint("growing islands:");
@ -312,8 +312,9 @@ main(int argc, char *argv[])
if (!write_newcap_script()) if (!write_newcap_script())
exit(1); exit(1);
if (chdir(gamedir)) { if (chdir(gamedir)) {
fprintf(stderr, "Can't chdir to %s (%s)\n", gamedir, strerror(errno)); fprintf(stderr, "%s: can't chdir to %s (%s)\n",
exit(EXIT_FAILURE); program_name, gamedir, strerror(errno));
exit(1);
} }
if (!ef_open(EF_SECTOR, EFF_MEM | EFF_NOTIME)) if (!ef_open(EF_SECTOR, EFF_MEM | EFF_NOTIME))
exit(1); exit(1);
@ -390,15 +391,15 @@ parse_args(int argc, char *argv[])
} }
nc = atoi(argv[0]); nc = atoi(argv[0]);
if (nc < 1) { if (nc < 1) {
fprintf(stderr, fprintf(stderr, "%s: number of continents must be > 0\n",
"fairland: error -- number of continents must be > 0"); program_name);
exit(1); exit(1);
} }
sc = atoi(argv[1]); sc = atoi(argv[1]);
if (sc < 1) { if (sc < 1) {
fprintf(stderr, fprintf(stderr, "%s: size of continents must be > 0\n",
"fairland: error -- size of continents must be > 0"); program_name);
exit(1); exit(1);
} }
@ -433,13 +434,13 @@ parse_args(int argc, char *argv[])
di = DEFAULT_CONTDIST; di = DEFAULT_CONTDIST;
if (di < 0) { if (di < 0) {
fprintf(stderr, fprintf(stderr, "%s: distance between continents must be >= 0\n",
"fairland: error -- distance between continents must be >= 0"); program_name);
exit(1); exit(1);
} }
if (di > WORLD_X / 2 || di > WORLD_Y / 2) { if (di > WORLD_X / 2 || di > WORLD_Y / 2) {
fprintf(stderr, fprintf(stderr, "%s: distance between continents too large\n",
"fairland: error -- distance between continents too large"); program_name);
exit(1); exit(1);
} }
@ -449,12 +450,14 @@ parse_args(int argc, char *argv[])
id = DEFAULT_ISLDIST; id = DEFAULT_ISLDIST;
if (id < 0) { if (id < 0) {
fprintf(stderr, fprintf(stderr,
"fairland: error -- distance from islands to continents must be >= 0"); "%s: distance from islands to continents must be >= 0\n",
program_name);
exit(1); exit(1);
} }
if (id > WORLD_X || id > WORLD_Y) { if (id > WORLD_X || id > WORLD_Y) {
fprintf(stderr, fprintf(stderr,
"fairland: error -- distance from islands to continents too large"); "%s: distance from islands to continents too large\n",
program_name);
exit(1); exit(1);
} }
} }
@ -519,7 +522,8 @@ init(void)
xx = yy % 2; xx = yy % 2;
if (yy == WORLD_Y) { if (yy == WORLD_Y) {
fprintf(stderr, fprintf(stderr,
"fairland error: world not big enough for all the continents.\n"); "%s: world not big enough for all the continents\n",
program_name);
exit(1); exit(1);
} }
} }
@ -1237,8 +1241,8 @@ write_newcap_script(void)
FILE *script = fopen(outfile, "w"); FILE *script = fopen(outfile, "w");
if (!script) { if (!script) {
fprintf(stderr, "fairland: error, unable to write to %s.\n", fprintf(stderr, "%s: unable to write to %s (%s)\n",
outfile); program_name, outfile, strerror(errno));
return 0; return 0;
} }