From 6bd0eabb21e2c466bc99a70be1cf70d8cfe475f0 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sun, 19 Feb 2006 17:07:04 +0000 Subject: [PATCH] (ef_init): Remove superflous size initialization for tables that are initialized from builtin config files. (ef_init_chr): Unused, remove. --- src/lib/common/file.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/lib/common/file.c b/src/lib/common/file.c index 48262417..ba709093 100644 --- a/src/lib/common/file.c +++ b/src/lib/common/file.c @@ -523,16 +523,6 @@ ef_fix_size(struct empfile *ep, int n) ep->csize = n + 1; } -static void -ef_init_chr(int type, size_t size, ptrdiff_t name_offs) -{ - struct empfile *ep = &empfile[type]; - char *p; - - for (p = ep->cache; *((char **)(p + name_offs)); p += size) ; - ep->cids = ep->fids = (p - ep->cache) / size; -} - /* * Initialize Empire tables. * Must be called once, before using anything else from this module. @@ -547,15 +537,6 @@ ef_init(void) empfile[EF_MAP].size = empfile[EF_BMAP].size = (WORLD_X * WORLD_Y) / 2; - ef_init_chr(EF_SHIP_CHR, - sizeof(struct mchrstr), offsetof(struct mchrstr, m_name)); - ef_init_chr(EF_PLANE_CHR, - sizeof(struct plchrstr), offsetof(struct plchrstr, pl_name)); - ef_init_chr(EF_LAND_CHR, - sizeof(struct lchrstr), offsetof(struct lchrstr, l_name)); - ef_init_chr(EF_NUKE_CHR, - sizeof(struct nchrstr), offsetof(struct nchrstr, n_name)); - ca = (struct castr *)empfile[EF_META].cache; for (i = 0; ca[i].ca_name; i++) ; ef_fix_size(&empfile[EF_META], i);