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

(lookup): Rename lookup() to symbol_by_value(), make it public

Browse source 
and move it to nstr.c.
This commit is contained in:
Ron Koenderink 2005-11-22 22:57:06 +00:00
parent edaa05b8cb
commit d4f52f6ca2
3 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/nsc.h
View file

@ -240,5 +240,6 @@ extern char *nstr_comp_val(char *, struct valstr*, int);
extern int nstr_coerce_val(struct valstr *, nsc_type, char *);
extern int nstr_exec(struct nscstr *, int, void *);
extern void nstr_exec_val(struct valstr *, natid, void *, nsc_type);
extern char *symbol_by_value(int, struct symbol *);
#endif /* _NSC_H_ */

12
src/lib/subs/nstr.c
View file

@ -680,3 +680,15 @@ nstr_exec_val(struct valstr *val, natid cnum, void *ptr, nsc_type want)
val->val_type = valtype;
}
char *
symbol_by_value(int key, struct symbol *table)
{
int i;
for (i = 0; table[i].name; i++)
if (key == table[i].value)
return table[i].name;
return NULL;
}

21
src/lib/subs/show.c
View file

@ -54,6 +54,7 @@
#include "file.h"
#include "nat.h"
#include "prototypes.h"
#include "nsc.h"
struct look_list {
union {
@ -125,18 +126,6 @@ make_new_list(int tlev, int type)
sort_lookup_list();
}
static char *
lookup(int key, struct symbol *table)
{
int i;
for (i = 0; table[i].name; i++)
if (key == table[i].value)
return table[i].name;
return NULL;
}
void
show_bridge(int tlev)
{
@ -224,7 +213,7 @@ show_nuke_capab(int tlev)
for (i = j = 0; i < 32; i++) {
if (!(np->n_flags & bit(i)))
continue;
if (NULL != (p = lookup(bit(i), nuke_chr_flags))) {
if (NULL != (p = symbol_by_value(bit(i), nuke_chr_flags))) {
if (j++ > 0)
pr(" ");
pr(p);
@ -338,7 +327,7 @@ show_ship_capab(int tlev)
for (j = n = 0; j < 32; j++) {
if (!(mp->m_flags & bit(j)))
continue;
if (NULL != (p = lookup(bit(j), ship_chr_flags))) {
if (NULL != (p = symbol_by_value(bit(j), ship_chr_flags))) {
if (n++ > 0)
pr(" ");
pr(p);
@ -389,7 +378,7 @@ show_plane_capab(int tlev)
for (i = n = 0; i < 32; i++) {
if (!(pp->pl_flags & bit(i)))
continue;
if (NULL != (p = lookup(bit(i), plane_chr_flags))) {
if (NULL != (p = symbol_by_value(bit(i), plane_chr_flags))) {
if (n++ > 0)
pr(" ");
pr(p);
@ -462,7 +451,7 @@ show_land_capab(int tlev)
for (j = n = 0; j < 32; j++) {
if (!(lcp->l_flags & bit(j)))
continue;
if (NULL != (p = lookup(bit(j), land_chr_flags))) {
if (NULL != (p = symbol_by_value(bit(j), land_chr_flags))) {
if (n++ > 0)
pr(" ");
pr(p);