From 011f88fec8fc7433f8eb6ac18a8a286063b2e1aa Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Fri, 6 Jan 2006 17:44:31 +0000
Subject: [PATCH] (acce, flash, nati, new, rela): Don't bother to complain
 about bad country argument, natarg() does that.

(acce, flash, nati, rela): natarg() ensures getnatp() succeeds, no
need to check.
---
 src/lib/commands/acce.c  | 9 ++-------
 src/lib/commands/flash.c | 5 +----
 src/lib/commands/nati.c  | 4 +---
 src/lib/commands/new.c   | 8 +++-----
 src/lib/commands/rela.c  | 9 ++-------
 5 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/src/lib/commands/acce.c b/src/lib/commands/acce.c
index 5b7df766..1d750953 100644
--- a/src/lib/commands/acce.c
+++ b/src/lib/commands/acce.c
@@ -58,16 +58,11 @@ acce(void)
     if (player->argp[1] == 0)
 	as = player->cnum;
     else {
-	if ((n = natarg(player->argp[1], "Which country? ")) < 0) {
-	    pr("Bad country number\n");
+	if ((n = natarg(player->argp[1], "Which country? ")) < 0)
 	    return RET_SYN;
-	}
 	as = (natid)n;
     }
-    if ((natp = getnatp(as)) == 0) {
-	pr("Bad country number %d\n", player->cnum);
-	return RET_SYN;
-    }
+    natp = getnatp(as);
     pr("\t%s Acceptance Status Report\t", cname(as));
     prdate();
     pr("\n  Acceptance status          %5s                theirs\n",
diff --git a/src/lib/commands/flash.c b/src/lib/commands/flash.c
index 8f003615..6cf9b6c1 100644
--- a/src/lib/commands/flash.c
+++ b/src/lib/commands/flash.c
@@ -53,10 +53,7 @@ flash(void)
     us = getnatp(player->cnum);
     if ((tocn = natarg(player->argp[1], "to which country? ")) < 0)
 	return RET_SYN;
-    if (!(to = getnatp((natid)tocn))) {
-	pr("Bad country number\n");
-	return RET_SYN;
-    }
+    to = getnatp(tocn);
 
     if (us->nat_stat == STAT_GOD) {
 	/* We are gods, we can flash anyone */
diff --git a/src/lib/commands/nati.c b/src/lib/commands/nati.c
index 200fcaf8..bbb84ba7 100644
--- a/src/lib/commands/nati.c
+++ b/src/lib/commands/nati.c
@@ -59,10 +59,8 @@ nati(void)
     else
     	cnum = player->cnum;
 
-    if ((natp = getnatp(cnum)) == 0) {
-	pr("Bad country number %d\n", cnum);
+    if ((natp = getnatp(cnum)) == 0)
 	return RET_SYN;
-    }
 
     if (!player->god && cnum != player->cnum) {
 	pr("Only deities can request a nation "
diff --git a/src/lib/commands/new.c b/src/lib/commands/new.c
index eb1098f1..9b1f0e13 100644
--- a/src/lib/commands/new.c
+++ b/src/lib/commands/new.c
@@ -72,12 +72,10 @@ new(void)
     natp = getnatp(player->cnum);
     if (natp->nat_xorg != 0 || natp->nat_yorg != 0) {
 	pr("Must be at 0,0 to add a new country\n");
-	return 0;
-    }
-    if ((n = natarg(player->argp[1], "Country? ")) < 0) {
-	pr("Bad country number\n");
-	return 0;
+	return RET_FAIL;
     }
+    if ((n = natarg(player->argp[1], "Country? ")) < 0)
+	return RET_SYN;
     num = n;
     natp = getnatp(num);
     if (natp->nat_stat != STAT_NEW) {
diff --git a/src/lib/commands/rela.c b/src/lib/commands/rela.c
index fd35af58..f6f65c94 100644
--- a/src/lib/commands/rela.c
+++ b/src/lib/commands/rela.c
@@ -58,16 +58,11 @@ rela(void)
     if (player->argp[1] == 0)
 	as = player->cnum;
     else {
-	if ((n = natarg(player->argp[1], "Which country? ")) < 0) {
-	    pr("Bad country number\n");
+	if ((n = natarg(player->argp[1], "Which country? ")) < 0)
 	    return RET_SYN;
-	}
 	as = (natid)n;
     }
-    if ((natp = getnatp(as)) == 0) {
-	pr("Bad country number %d\n", player->cnum);
-	return RET_SYN;
-    }
+    natp = getnatp(as);
     pr("\t%s Diplomatic Relations Report\t", cname(as));
     prdate();
     pr("\n  Formal Relations         %5s      theirs\n",