relations: Inline relatename() into its only caller rela()

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

diff --git a/include/nat.h b/include/nat.h
index f3993054336a7848a59d1b44e42656a249c3093e..c0e5fdd13b56a88489babe865ab08ff32e2860a3 100644 (file)
--- a/include/nat.h
+++ b/include/nat.h
@@ -199,7 +199,6 @@ extern double techfact(int level, double mult);
 
 /* src/lib/common/nat.c */
 extern char *cname(natid n);
-extern char *relatename(struct natstr *np, natid other);
 extern char *natstate(struct natstr *np);
 extern enum relations getrel(struct natstr *np, natid them);
 extern enum relations relations_with(natid, natid);

diff --git a/src/lib/commands/rela.c b/src/lib/commands/rela.c
index 3ef2018a22b3b128c54580dda638e1782d23b653..4f505457dbb01c9965db15fb14ef241b435a3a74 100644 (file)
--- a/src/lib/commands/rela.c
+++ b/src/lib/commands/rela.c
@@ -75,7 +75,9 @@ rela(void)
                continue;
        }
        pr("%3d) %-20.20s  ", cn, cname(cn));
-       pr("%-10s %s\n", relatename(natp, cn), relatename(np, as));
+       pr("%-10s %s\n",
+          relations_string(getrel(natp, cn)),
+          relations_string(getrel(np, as)));
     }
     return RET_OK;
 }

diff --git a/src/lib/common/nat.c b/src/lib/common/nat.c
index 35fdb2c4ad9d8682c90081d9efe221ab55b443fd..ecaffe90571fa87f4f3d97201f09eb61a6a4d457 100644 (file)
--- a/src/lib/common/nat.c
+++ b/src/lib/common/nat.c
@@ -51,12 +51,6 @@ cname(natid n)
     return np->nat_cnam;
 }
 
-char *
-relatename(struct natstr *np, natid other)
-{
-    return relations_string(getrel(np, other));
-}
-
 char *
 natstate(struct natstr *np)
 {