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

fairland: Report errors to stderr, not stdout

Browse source 
fairland reports some errors to stdout instead of stderr.  Fix that.

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 581d1bae12
commit 9c07d02519
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/util/fairland.c
View file

@ -390,13 +390,15 @@ parse_args(int argc, char *argv[])
} }
nc = atoi(argv[0]); nc = atoi(argv[0]);
if (nc < 1) { if (nc < 1) {
puts("fairland: error -- number of continents must be > 0"); fprintf(stderr,
"fairland: error -- number of continents must be > 0");
exit(1); exit(1);
} }
sc = atoi(argv[1]); sc = atoi(argv[1]);
if (sc < 1) { if (sc < 1) {
puts("fairland: error -- size of continents must be > 0"); fprintf(stderr,
"fairland: error -- size of continents must be > 0");
exit(1); exit(1);
} }
@ -431,11 +433,13 @@ parse_args(int argc, char *argv[])
di = DEFAULT_CONTDIST; di = DEFAULT_CONTDIST;
if (di < 0) { if (di < 0) {
puts("fairland: error -- distance between continents must be >= 0"); fprintf(stderr,
"fairland: error -- distance between continents must be >= 0");
exit(1); exit(1);
} }
if (di > WORLD_X / 2 || di > WORLD_Y / 2) { if (di > WORLD_X / 2 || di > WORLD_Y / 2) {
puts("fairland: error -- distance between continents too large"); fprintf(stderr,
"fairland: error -- distance between continents too large");
exit(1); exit(1);
} }
@ -444,11 +448,13 @@ parse_args(int argc, char *argv[])
else else
id = DEFAULT_ISLDIST; id = DEFAULT_ISLDIST;
if (id < 0) { if (id < 0) {
puts("fairland: error -- distance from islands to continents must be >= 0"); fprintf(stderr,
"fairland: error -- distance from islands to continents must be >= 0");
exit(1); exit(1);
} }
if (id > WORLD_X || id > WORLD_Y) { if (id > WORLD_X || id > WORLD_Y) {
puts("fairland: error -- distance from islands to continents too large"); fprintf(stderr,
"fairland: error -- distance from islands to continents too large");
exit(1); exit(1);
} }
} }
@ -512,7 +518,8 @@ init(void)
++yy; ++yy;
xx = yy % 2; xx = yy % 2;
if (yy == WORLD_Y) { if (yy == WORLD_Y) {
puts("fairland error: world not big enough for all the continents.\n"); fprintf(stderr,
"fairland error: world not big enough for all the continents.\n");
exit(1); exit(1);
} }
} }
@ -1230,7 +1237,8 @@ write_newcap_script(void)
FILE *script = fopen(outfile, "w"); FILE *script = fopen(outfile, "w");
if (!script) { if (!script) {
printf("fairland: error, unable to write to %s.\n", outfile); fprintf(stderr, "fairland: error, unable to write to %s.\n",
outfile);
return 0; return 0;
} }