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

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.

diff --git a/include/product.h b/include/product.h
index 1e296731c5178a4df57436f2607d8d6e352a059b..c6326ac5457d38025966eb1067d99a47e5933fd7 100644 (file)
--- a/include/product.h
+++ b/include/product.h
@@ -77,6 +77,4 @@ struct pchrstr {
 
 extern struct pchrstr pchr[P_MDUST + 2];
 
-extern int prd_maxno;
-
 #endif /* _PRODUCT_H_ */

diff --git a/src/lib/global/init.c b/src/lib/global/init.c
index 2839b7d5c061609d52f158ca770c5140e29d1044..beb14f349a043d3f53b2260dc3294383734e3f92 100644 (file)
--- a/src/lib/global/init.c
+++ b/src/lib/global/init.c
@@ -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;

diff --git a/src/lib/global/product.c b/src/lib/global/product.c
index 6a9ac1dfc9c1539f582e0e2f2ed56b31491090cf..f4b98560842a5d3feee8c6b009315347d74868d4 100644 (file)
--- a/src/lib/global/product.c
+++ b/src/lib/global/product.c
@@ -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;

diff --git a/src/server/main.c b/src/server/main.c
index 4a2778ae6ad81b8b09c5981b01176b5a53177f39..bec77d3d7e9350b57f032ec4aaf49490a43b70fe 100644 (file)
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -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;