accept: rejectname() makes no sense outside acce(); inline

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/include/nat.h b/include/nat.h
index 1998995d0cd8bb80c435089edfc3d5443e82554e..3614e55ff595657066f0977342981677c99d811a 100644 (file)
--- a/include/nat.h
+++ b/include/nat.h
@@ -166,7 +166,6 @@ extern double techfact(int level, double mult);
 
 extern char *cname(natid n);
 extern char *relatename(struct natstr *np, natid other);
-extern char *rejectname(struct natstr *np, natid other);
 extern char *natstate(struct natstr *np);
 extern int getrel(struct natstr *np, natid them);
 extern int relations_with(natid, natid);

diff --git a/src/lib/commands/acce.c b/src/lib/commands/acce.c
index b4d02c70cfcc283c6eb00bf1b03876214decb9d0..9612ab8d11857eabd811f29667508c10ef6fbf36 100644 (file)
--- a/src/lib/commands/acce.c
+++ b/src/lib/commands/acce.c
@@ -42,6 +42,25 @@
 int
 acce(void)
 {
+    static char *rejects[] = {
+       /* must follow reject flags defined in nat.h */
+       "  YES  YES  YES  YES",
+       "  NO   YES  YES  YES",
+       "  YES  NO   YES  YES",
+       "  NO   NO   YES  YES",
+       "  YES  YES  NO   YES",
+       "  NO   YES  NO   YES",
+       "  YES  NO   NO   YES",
+       "  NO   NO   NO   YES",
+       "  YES  YES  YES  NO ",
+       "  NO   YES  YES  NO ",
+       "  YES  NO   YES  NO ",
+       "  NO   NO   YES  NO ",
+       "  YES  YES  NO   NO ",
+       "  NO   YES  NO   NO ",
+       "  YES  NO   NO   NO ",
+       "  NO   NO   NO   NO "
+    };
     struct natstr *natp;
     struct natstr *np;
     natid cn;
@@ -67,7 +86,9 @@ acce(void)
        if (np->nat_stat == STAT_UNUSED)
            continue;
        pr("%3d) %-14.14s  ", cn, cname(cn));
-       pr("%-9s %s\n", rejectname(natp, cn), rejectname(np, as));
+       pr("%s %s\n",
+          rejects[getrejects(cn, natp)],
+          rejects[getrejects(as, np)]);
     }
     return RET_OK;
 }

diff --git a/src/lib/common/nat.c b/src/lib/common/nat.c
index 73028a27f5f94e5fffb52b8afa7da6d351aa667f..82a092a0c2a5a67ce49b76fe0c4b6a9cd38a8d50 100644 (file)
--- a/src/lib/common/nat.c
+++ b/src/lib/common/nat.c
@@ -63,32 +63,6 @@ relatename(struct natstr *np, natid other)
     return relates[getrel(np, other)];
 }
 
-char *
-rejectname(struct natstr *np, natid other)
-{
-    static char *rejects[] = {
-       /* must follow reject flags defined in nat.h */
-       "  YES  YES  YES  YES",
-       "  NO   YES  YES  YES",
-       "  YES  NO   YES  YES",
-       "  NO   NO   YES  YES",
-       "  YES  YES  NO   YES",
-       "  NO   YES  NO   YES",
-       "  YES  NO   NO   YES",
-       "  NO   NO   NO   YES",
-       "  YES  YES  YES  NO ",
-       "  NO   YES  YES  NO ",
-       "  YES  NO   YES  NO ",
-       "  NO   NO   YES  NO ",
-       "  YES  YES  NO   NO ",
-       "  NO   YES  NO   NO ",
-       "  YES  NO   NO   NO ",
-       "  NO   NO   NO   NO "
-    };
-
-    return rejects[getrejects(other, np)];
-}
-
 char *
 natstate(struct natstr *np)
 {