From d4f0cb3576df1cb982acde1eac4fe03bb4cf4d2c Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 5 Feb 2011 09:30:12 +0100
Subject: [PATCH] Change setrel(), setcont(), setrej() to return void

Nobody cares for their value anyway.
---
 include/prototypes.h |  6 +++---
 src/lib/subs/rej.c   | 21 +++++++++------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/include/prototypes.h b/include/prototypes.h
index e7cdb6b5f..f0ddb711b 100644
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -585,9 +585,9 @@ extern int delty(struct range *, coord);
 extern void radmap(int, int, int, double, int, double);
 extern void rad_map_set(natid, int, int, int, double, int);
 /* rej.c */
-extern int setrel(natid, natid, int);
-extern int setcont(natid, natid, int);
-extern int setrej(natid, natid, int, int);
+extern void setrel(natid, natid, int);
+extern void setcont(natid, natid, int);
+extern void setrej(natid, natid, int, int);
 /* retreat.c */
 extern void retreat_ship(struct shpstr *, char);
 extern void retreat_land(struct lndstr *, char);
diff --git a/src/lib/subs/rej.c b/src/lib/subs/rej.c
index 544cc35a5..9663e7299 100644
--- a/src/lib/subs/rej.c
+++ b/src/lib/subs/rej.c
@@ -41,7 +41,7 @@
 #include "prototypes.h"
 #include "server.h"
 
-int
+void
 setrel(natid us, natid them, int rel)
 {
     struct natstr *mynp = getnatp(us);
@@ -59,9 +59,10 @@ setrel(natid us, natid them, int rel)
     if (CANT_HAPPEN(rel > ALLIED))
 	rel = ALLIED;
     if (CANT_HAPPEN(!mynp || !themnp))
-	return RET_FAIL;
-    if ((oldrel = getrel(mynp, them)) == rel)
-	return RET_FAIL;
+	return;
+    oldrel = getrel(mynp, them);
+    if (oldrel == rel)
+	return;
     themname = cname(them);
     if (rel > oldrel)
 	whichway = "upgraded";
@@ -109,30 +110,26 @@ setrel(natid us, natid them, int rel)
     }
     if (opt_HIDDEN)
 	setcont(them, us, FOUND_TELE);
-
-    return RET_OK;
 }
 
-int
+void
 setcont(natid us, natid them, int contact)
 {
     struct natstr *np = getnatp(us);
 
     if (CANT_HAPPEN(!np))
-	return 0;
+	return;
     putcontact(np, them, contact);
     putnat(np);
-    return 1;
 }
 
-int
+void
 setrej(natid us, natid them, int how, int what)
 {
     struct natstr *np = getnatp(us);
 
     if (CANT_HAPPEN(!np))
-	return 0;
+	return;
     putreject(np, them, how, what);
     putnat(np);
-    return 1;
 }
-- 
2.43.0