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

accept: Don't rely on rejection flag encoding

Browse source 
Instead of enumerating all eight combinations of the three flags in a
table, simply print each flag on its own, and drop the table.  The old
table depends on the flag encoding, the new code doesn't.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-10-29 11:19:19 +02:00
parent 2fcc325dd5
commit c3f6dfda9d
1 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/lib/commands/acce.c
View file

@ -79,17 +79,11 @@ acce(void)
static void static void
pr_accept(struct natstr *to, natid from) pr_accept(struct natstr *to, natid from)
{ {
static char *rejects[] = { static char *yes_no[] = { "YES", "NO " };
/* must follow reject flags defined in nat.h */ int rej = getrejects(from, to);
" YES YES YES",
" NO YES YES",
" YES NO YES",
" NO NO YES",
" YES YES NO ",
" NO YES NO ",
" YES NO NO ",
" NO NO NO ",
};
pr(" %s", rejects[getrejects(from, to)]); pr(" %s %s %s",
yes_no[(rej & REJ_TELE) != 0],
yes_no[(rej & REJ_ANNO) != 0],
yes_no[(rej & REJ_LOAN) != 0]);
} }