From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 29 Oct 2011 18:19:06 +0000 (+0200)
Subject: Make allocate_memory() return void
X-Git-Tag: v4.3.29~43
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=06753c7e2bcf2b0655c0c519b61467b6dcff10f3

Make allocate_memory() return void

It can't fail since commit ba1a320c, v4.3.15.
---

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