commands: Rename the command functions

[empserver] / src / lib / commands / reje.c

diff --git a/src/lib/commands/reje.c b/src/lib/commands/reje.c
index 8da60a57d752e661300088a0a8f546eb36d152ac..2cc08160ece1ef27aa3ec468997c5f2df3337f29 100644 (file)
--- a/src/lib/commands/reje.c
+++ b/src/lib/commands/reje.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -25,28 +24,28 @@
  *
  *  ---
  *
- *  reje.c: Refuse telegrams/annos/treaties/loans from countries
+ *  reje.c: Refuse telegrams/annos/loans from countries
  *
  *  Known contributors to this file:
- *
+ *     Markus Armbruster, 2006-2016
  */
 
 #include <config.h>
 
 #include "commands.h"
-#include "optlist.h"
 
 int
-reje(void)
+c_reject(void)
 {
+    static char *what[] = { "teles", "annos", "loans" };
     char *p;
-    int rel;
+    enum rej_comm rej;
     int do_undo;
     struct natstr nat;
     struct nstr_item ni;
     char buf[1024];
 
-    if ((p = getstarg(player->argp[1], "reject or accept? ", buf)) == 0)
+    if (!(p = getstarg(player->argp[1], "reject or accept? ", buf)))
        return RET_SYN;
     switch (*p) {
     case 'r':
@@ -59,22 +58,19 @@ reje(void)
        pr("That's not one of the choices!\n");
        return RET_SYN;
     }
-    if ((p =
-        getstarg(player->argp[2],
-                 "mail, treaties, loans, or announcements? ", buf)) == 0)
+    p = getstarg(player->argp[2],
+                "mail, loans, or announcements? ", buf);
+    if (!p)
        return RET_SYN;
     switch (*p) {
     case 'a':
-       rel = REJ_ANNO;
+       rej = REJ_ANNO;
        break;
     case 'l':
-       rel = REJ_LOAN;
+       rej = REJ_LOAN;
        break;
     case 'm':
-       rel = REJ_TELE;
-       break;
-    case 't':
-       rel = REJ_TREA;
+       rej = REJ_TELE;
        break;
     default:
        pr("That's not one of the choices!\n");
@@ -91,25 +87,10 @@ reje(void)
        }
        if (nat.nat_stat == STAT_UNUSED)
            continue;
-       switch (rel) {
-       case REJ_ANNO:
-           pr("%s annos from %s\n",
-              (do_undo == 1 ? "Rejecting" : "Accepting"), nat.nat_cnam);
-           break;
-       case REJ_LOAN:
-           pr("%s loans from %s\n",
-              (do_undo == 1 ? "Rejecting" : "Accepting"), nat.nat_cnam);
-           break;
-       case REJ_TELE:
-           pr("%s teles from %s\n",
-              (do_undo == 1 ? "Rejecting" : "Accepting"), nat.nat_cnam);
-           break;
-       case REJ_TREA:
-           pr("%s treaties from %s\n",
-              (do_undo == 1 ? "Rejecting" : "Accepting"), nat.nat_cnam);
-           break;
-       }
-       setrej(player->cnum, (natid)ni.cur, do_undo, rel);
+       pr("%s %s from %s\n",
+          (do_undo == 1 ? "Rejecting" : "Accepting"),
+          what[rej], nat.nat_cnam);
+       setrej(player->cnum, (natid)ni.cur, do_undo, rej);
     }
     return RET_OK;
 }