From f54f6551301c965dbc8feffeb0459d6aa7ec0155 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Mon, 31 Oct 2016 15:26:26 +0100
Subject: [PATCH] relations: Inline relatename() into its only caller rela()

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
---
 include/nat.h           | 1 -
 src/lib/commands/rela.c | 4 +++-
 src/lib/common/nat.c    | 6 ------
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/include/nat.h b/include/nat.h
index f3993054..c0e5fdd1 100644
--- 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 3ef2018a..4f505457 100644
--- 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 35fdb2c4..ecaffe90 100644
--- 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)
 {