empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-10-31 15:26:26 +01:00
parent 129fe58c19
commit f54f655130
3 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/nat.h
View file

@ -199,7 +199,6 @@ extern double techfact(int level, double mult);
/* src/lib/common/nat.c */ /* src/lib/common/nat.c */
extern char *cname(natid n); extern char *cname(natid n);
extern char *relatename(struct natstr *np, natid other);
extern char *natstate(struct natstr *np); extern char *natstate(struct natstr *np);
extern enum relations getrel(struct natstr *np, natid them); extern enum relations getrel(struct natstr *np, natid them);
extern enum relations relations_with(natid, natid); extern enum relations relations_with(natid, natid);

4
src/lib/commands/rela.c
View file

@ -75,7 +75,9 @@ rela(void)
continue; continue;
} }
pr("%3d) %-20.20s ", cn, cname(cn)); 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; return RET_OK;
} }

6
src/lib/common/nat.c
View file

@ -51,12 +51,6 @@ cname(natid n)
return np->nat_cnam; return np->nat_cnam;
} }
char *
relatename(struct natstr *np, natid other)
{
return relations_string(getrel(np, other));
}
char * char *
natstate(struct natstr *np) natstate(struct natstr *np)
{ {