From d97ae0f0e06c3381a68cfa6b453f36ce64539090 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Tue, 4 May 2004 19:34:35 +0000
Subject: [PATCH] Kleine Anpassungen (warnings mit gcc)

---
 src/common/gamecode/creport.c | 2 +-
 src/common/gamecode/report.c  | 2 +-
 src/common/gamecode/study.c   | 2 +-
 src/common/kernel/build.c     | 2 +-
 src/common/kernel/save.c      | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/common/gamecode/creport.c b/src/common/gamecode/creport.c
index 1ca2b0c69..e72a9cae4 100644
--- a/src/common/gamecode/creport.c
+++ b/src/common/gamecode/creport.c
@@ -419,7 +419,7 @@ creport_cleanup(void)
 	junkyard = 0;
 }
 
-static int msgno;
+/*static int msgno; */
 
 #define MTMAXHASH 1023
 
diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c
index 0b7b08de0..00121ca71 100644
--- a/src/common/gamecode/report.c
+++ b/src/common/gamecode/report.c
@@ -104,7 +104,7 @@ char *agename;
 int  seasons;
 
 static const char*
-MailitPath()
+MailitPath(void)
 {
   static const char * value = NULL;
   if (value==NULL) {
diff --git a/src/common/gamecode/study.c b/src/common/gamecode/study.c
index 68f3b07da..1a45be6a4 100644
--- a/src/common/gamecode/study.c
+++ b/src/common/gamecode/study.c
@@ -54,7 +54,7 @@
 #define TEACHNUMBER 10
 
 static boolean
-ExpensiveMigrants()
+ExpensiveMigrants(void)
 {
   int value = -1;
   if (value<0) {
diff --git a/src/common/kernel/build.c b/src/common/kernel/build.c
index 68b729460..44f9d50fd 100644
--- a/src/common/kernel/build.c
+++ b/src/common/kernel/build.c
@@ -68,7 +68,7 @@
 
 
 static boolean
-CheckOverload()
+CheckOverload(void)
 {
   static int value = -1;
   if (value<0) {
diff --git a/src/common/kernel/save.c b/src/common/kernel/save.c
index 3c0c31a21..4fec75a4f 100644
--- a/src/common/kernel/save.c
+++ b/src/common/kernel/save.c
@@ -1512,9 +1512,9 @@ addally(const faction * f, ally ** sfp, int aid, int state)
   if (af!=NULL && af->alliance!=f->alliance) state &= ~ALLIES_ONLY;;
 # else
 # endif
-  if (af!=NULL && af->alliance!=f->alliance) return;
+  if (af!=NULL && af->alliance!=f->alliance) return sfp;
 #endif
-  if (state==0) return;
+  if (state==0) return sfp;
 
   sf = calloc(1, sizeof(ally));
   sf->faction = af;
@@ -1523,7 +1523,7 @@ addally(const faction * f, ally ** sfp, int aid, int state)
 
   while (*sfp) sfp=&(*sfp)->next;
   *sfp = sf;
-  return &sf;
+  return &sf->next;
 }
 
 /** Reads a faction from a file.