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

(prd_maxno): Variable's value is well-known constant P_MDUST + 2.

Browse source 
Useless, remove.  Users changed to check pchr's sentinel, because
that's clearer than comparing the index to P_MDUST or sizeof(pchr) /
sizeof(*pchr).

(pchr): Change sentinel's p_name and p_sname to NULL.  Sentinel
checks changed.
This commit is contained in:
Markus Armbruster 2005-11-06 18:06:38 +00:00
parent 23f134aa75
commit 19953e6c22
4 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/product.h
View file

@ -77,6 +77,4 @@ struct pchrstr {
extern struct pchrstr pchr[P_MDUST + 2];
extern int prd_maxno;
#endif /* _PRODUCT_H_ */

3
src/lib/global/init.c
View file

@ -86,9 +86,8 @@ static void
init_pchr(void)
{
struct pchrstr *p;
int pcount;
for (p = pchr, pcount = 0; pcount < prd_maxno; pcount++, p++) {
for (p = pchr; p->p_name; p++) {
if (opt_GO_RENEW) {
if (p->p_type == I_DUST || p->p_type == I_OIL)
p->p_nrdep = 0;

4
src/lib/global/product.c
View file

@ -92,7 +92,5 @@ struct pchrstr pchr[] = {
I_DUST, -1, 0, offsetof(struct sctstr, sct_gmin), 20, -1, 0, 0, 75,
"gold dust", "dust",},
{{I_NONE, I_NONE, I_NONE}, {0, 0, 0},
I_NONE, 0, 0, 0, 0, 0, 0, 0, 0, "", "",}
I_NONE, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL,}
};
int prd_maxno = (sizeof(pchr) / sizeof(struct pchrstr)) - 1;

2
src/server/main.c
View file

@ -531,7 +531,7 @@ nullify_objects(void)
if (opt_NO_LCMS)
dchr[i].d_lcms = 0;
}
for (i = 0; i < prd_maxno; i++) {
for (i = 0; pchr[i].p_name; i++) {
for (j = 0; j < MAXPRCON; j++) {
if (opt_NO_HCMS && pchr[i].p_ctype[j] == I_HCM)
pchr[i].p_camt[j] = 0;