From 06753c7e2bcf2b0655c0c519b61467b6dcff10f3 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 29 Oct 2011 20:19:06 +0200 Subject: [PATCH] Make allocate_memory() return void It can't fail since commit ba1a320c, v4.3.15. --- src/util/fairland.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/util/fairland.c b/src/util/fairland.c index f885720b8..d2e2cc896 100644 --- a/src/util/fairland.c +++ b/src/util/fairland.c @@ -152,7 +152,7 @@ static const char *numletter = static void help(char *); static void usage(void); static void parse_args(int argc, char *argv[]); -static int allocate_memory(void); +static void allocate_memory(void); static void init(void); static int drift(void); static void grow_continents(void); @@ -227,8 +227,7 @@ main(int argc, char *argv[]) exit(1); empfile_fixup(); - if (allocate_memory() == -1) - exit(-1); + allocate_memory(); print_vars(); do { @@ -430,7 +429,7 @@ parse_args(int argc, char *argv[]) VARIABLE INITIALIZATION ****************************************************************************/ -static int +static void allocate_memory(void) { int i; @@ -463,7 +462,6 @@ allocate_memory(void) sectc[i] = calloc(is * 2, sizeof(int)); } - return 0; } static void -- 2.43.0