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

(intmatch): Assumes that struct size is a multiple of sizeof(int), out

Browse source 
of laziness.  The assumption is true on any sane machine, due to
alignment constraints.  But the function doesn't provide enough value
to make me fix or document this.  Remove it.
(lookup): Replace it.
This commit is contained in:
Markus Armbruster 2005-10-29 07:15:14 +00:00
parent b8e2f4a92a
commit 747d1333cc
3 changed files with 11 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -132,14 +132,16 @@ make_new_list(int tlev, int type)
sort_lookup_list();
}
static s_char *
static char *
lookup(int key, struct lookup *table)
{
int match;
int i;
if ((match = intmatch(key, &table->key, sizeof(*table))) < 0)
return 0;
return table[match].value;
for (i = 0; table[i].value; i++)
if (key == table[i].key)
return table[i].value;
return NULL;
}
void
@ -219,7 +221,7 @@ show_nuke_capab(int tlev)
{
struct nchrstr *np;
int i, j, n;
s_char *p;
char *p;
if (opt_DRNUKE)
pr("%13s blst dam lbs tech res $%7s abilities\n", "", "");
@ -342,7 +344,7 @@ show_ship_capab(int tlev)
int j;
int scount;
int n;
s_char *p;
char *p;
pr("%25s cargos & capabilities\n", "");
@ -402,7 +404,7 @@ show_plane_capab(int tlev)
int i;
int pcount;
int n;
s_char *p;
char *p;
pr("%25s capabilities\n", "");
make_new_list(tlev, EF_PLANE);
@ -467,7 +469,7 @@ show_land_capab(int tlev)
int lcount;
i_type i;
int j, n;
s_char *p;
char *p;
pr("%25s capabilities\n", "");