Consolidate ARRAY_SIZE macro; remove one unneeded global var (walter harms <wharms@bfs.de>)

This commit is contained in:
Denis Vlasenko
2007-06-25 10:55:35 +00:00
parent 1399282b47
commit 80b8b39899
26 changed files with 55 additions and 66 deletions

View File

@@ -390,7 +390,7 @@ static const char vValues[] =
/* hash size may grow to these values */
#define FIRST_PRIME 61;
static const unsigned PRIMES[] = { 251, 1021, 4093, 16381, 65521 };
enum { NPRIMES = sizeof(PRIMES) / sizeof(PRIMES[0]) };
/* Globals. Split in two parts so that first one is addressed
@@ -570,7 +570,7 @@ static void hash_rebuild(xhash *hash)
unsigned newsize, i, idx;
hash_item **newitems, *hi, *thi;
if (hash->nprime == NPRIMES)
if (hash->nprime == ARRAY_SIZE(PRIMES))
return;
newsize = PRIMES[hash->nprime++];

View File

@@ -2230,8 +2230,7 @@ static char readit(void) // read (maybe cursor) key from stdin
{"[13~", VI_K_FUN3}, // Function Key F3
{"[14~", VI_K_FUN4}, // Function Key F4
};
#define ESCCMDS_COUNT (sizeof(esccmds)/sizeof(struct esc_cmds))
enum { ESCCMDS_COUNT = ARRAY_SIZE(esccmds) };
alarm(0); // turn alarm OFF while we wait for input
fflush(stdout);