(rpt, page_headings): Declare with array size. Define without.

(empfile): Correctly initialize members cids, csize, fids for all
EFF_STATIC tables except EF_SHIP_CHR, EF_PLANE_CHR, EF_LAND_CHR,
EF_NUKE_CHR, EF_META and the symbol tables.

diff --git a/include/news.h b/include/news.h
index 074227b7bb72ecbf19896a2c196e4e2fe2146abd..660ec6d262bf3b1e882b608dd3e1e1f0e298449b 100644 (file)
--- a/include/news.h
+++ b/include/news.h
@@ -164,7 +164,7 @@ struct rptstr {
 #define getnewsp(n) \
        (struct nwsstr *) ef_ptr(EF_NEWS, n)
 
-extern struct rptstr rpt[];
-extern char *page_headings[];
+extern struct rptstr rpt[N_MAX_VERB + 2];
+extern char *page_headings[N_MAX_PAGE + 1];
 
 #endif /* _NEWS_H_ */

diff --git a/src/lib/global/file.c b/src/lib/global/file.c
index ede8593b4721b82b2da8a96ca10f21572a889256..7ebd97e4eabc8534f4dd437c42db2fcb30e369b1 100644 (file)
--- a/src/lib/global/file.c
+++ b/src/lib/global/file.c
@@ -102,11 +102,14 @@ struct empfile empfile[] = {
      sizeof(struct loststr), NULL, NULL, NULL,
      -1, -1, 0, 0, NULL, 0, lost_ca},
 
-    /* Static game data (configuation) */
+    /* Static game data (configuration) */
 #define EFF_CFG (EFF_RDONLY | EFF_MEM | EFF_STATIC)
-    {EF_SECTOR_CHR, "sect chr", NULL, EFF_CFG,
-     sizeof(dchr[0]), NULL, NULL, NULL,
-     -1, -1, 0, 0, (char *)dchr, 0, dchr_ca},
+#define SZ(array) (sizeof(array) / sizeof((array)[0]))
+#define CFGTAB(type, name, array, ca) \
+{(type), (name), NULL, EFF_RDONLY | EFF_MEM | EFF_STATIC, \
+ sizeof((array)[0]), NULL, NULL, NULL, \
+ -1, 0, SZ((array)) - 1, SZ((array)), (char *)(array), SZ((array)) - 1, (ca)}
+    CFGTAB(EF_SECTOR_CHR, "sect chr", dchr, dchr_ca),
     {EF_SHIP_CHR, "ship chr", NULL, EFF_CFG,
      sizeof(mchr[0]), NULL, NULL, NULL,
      -1, -1, 0, 0, (char *)mchr, 0, mchr_ca},
@@ -119,24 +122,14 @@ struct empfile empfile[] = {
     {EF_NUKE_CHR, "nuke chr", NULL, EFF_CFG,
      sizeof(nchr[0]), NULL, NULL, NULL,
      -1, -1, 0, 0, (char *)nchr, 0, nchr_ca},
-    {EF_NEWS_CHR, "news chr", NULL, EFF_CFG,
-     sizeof(rpt[0]), NULL, NULL, NULL,
-     -1, -1, 0, 0, (char *)rpt, 0, rpt_ca},
+    CFGTAB(EF_NEWS_CHR, "news chr", rpt, rpt_ca),
     {EF_TREATY_FLAGS, "treaty flags", NULL, EFF_CFG,
      sizeof(treaty_flags[0]), NULL, NULL, NULL,
      -1, -1, 0, 0, (char *)treaty_flags, 0, symbol_ca},
-    {EF_ITEM, "item", NULL, EFF_CFG,
-     sizeof(ichr[0]), NULL, NULL, NULL,
-     -1, -1, 0, 0, (char *)ichr, 0, ichr_ca},
-    {EF_INFRASTRUCTURE, "infrastructure", NULL, EFF_CFG,
-     sizeof(intrchr[0]), NULL, NULL, NULL,
-     -1, -1, 0, 0, (char *)intrchr, 0, intrchr_ca},
-    {EF_PRODUCT, "product", NULL, EFF_CFG,
-     sizeof(pchr[0]), NULL, NULL, NULL,
-     -1, -1, 0, 0, (char *)pchr, 0, pchr_ca},
-    {EF_TABLE, "table", NULL, EFF_CFG,
-     sizeof(empfile[0]), NULL, NULL, NULL,
-     -1, -1, 0, 0, (char *)empfile, 0, empfile_ca},
+    CFGTAB(EF_ITEM, "item", ichr, ichr_ca),
+    CFGTAB(EF_INFRASTRUCTURE, "infrastructure", intrchr, intrchr_ca),
+    CFGTAB(EF_PRODUCT, "product", pchr, pchr_ca),
+    CFGTAB(EF_TABLE, "table", empfile, empfile_ca),
     {EF_SHIP_CHR_FLAGS, "ship chr flags", NULL, EFF_CFG,
      sizeof(ship_chr_flags[0]), NULL, NULL, NULL,
      -1, -1, 0, 0, (char *)ship_chr_flags, 0, symbol_ca},

diff --git a/src/lib/global/news.c b/src/lib/global/news.c
index 5738f1027ba167f02019a7af51a58d23650756c8..e81ee099c1bf65656dbbecde693f200fa12014c0 100644 (file)
--- a/src/lib/global/news.c
+++ b/src/lib/global/news.c
@@ -41,7 +41,7 @@
 #include "misc.h"
 #include "news.h"
 
-char *page_headings[N_MAX_PAGE + 1] = {
+char *page_headings[] = {
 /* not used */ "Comics",
 /* N_FOR    */ "Foreign Affairs",
 /* N_FRONT  */ "The Front Line",
@@ -58,7 +58,7 @@ char *page_headings[N_MAX_PAGE + 1] = {
 
 static char no_news[] = "does nothing in particular to %s";
 
-struct rptstr rpt[N_MAX_VERB + 2] = {
+struct rptstr rpt[] = {
 /*  nice  page     text */
 /*  0*/ { 0,  0, { no_news, no_news } },
     { -4, N_FRONT, { "infantry capture %s territory",