From 04c247f2daaf69a479da75eb36868b1a37e2bc9d Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sun, 6 Nov 2005 20:59:38 +0000
Subject: [PATCH] (lnd_maxno): Variable's value is well-known constant
 N_MAXLAND + 1. Useless, remove.  Users changed to check lchr's sentinel,
 because that's clearer than comparing the index to N_MAXLAND or sizeof(lchr)
 / sizeof(*lchr).

(lchr): Change sentinel's l_name to NULL.
---
 include/land.h        | 1 -
 src/lib/global/land.c | 4 +---
 src/lib/subs/show.c   | 4 +---
 src/server/main.c     | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/include/land.h b/include/land.h
index 6bb8da41a..62533403d 100644
--- a/include/land.h
+++ b/include/land.h
@@ -182,7 +182,6 @@ struct lchrstr {
 	(struct lndstr *) ef_ptr(EF_LAND, n)
 
 extern struct lchrstr lchr[N_MAXLAND + 1];
-extern int lnd_maxno;
 
 struct llist {
     struct emp_qelem queue;	/* list of units */
diff --git a/src/lib/global/land.c b/src/lib/global/land.c
index 8ed37ab6a..0b855d43c 100644
--- a/src/lib/global/land.c
+++ b/src/lib/global/land.c
@@ -207,11 +207,9 @@ struct lchrstr lchr[] = {
 */
 
     {{0},
-     "",
+     NULL,
      0, 0, 0, 0, 0, 0, 0,
      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
      0,
      }
 };
-
-int lnd_maxno = (sizeof(lchr) / sizeof(struct lchrstr)) - 1;
diff --git a/src/lib/subs/show.c b/src/lib/subs/show.c
index 77559666a..10a90553c 100644
--- a/src/lib/subs/show.c
+++ b/src/lib/subs/show.c
@@ -117,11 +117,9 @@ make_new_list(int tlev, int type)
 	    lookup_list_cnt++;
 	}
     } else if (type == EF_LAND) {
-	for (lp = lchr, count = 0; count < lnd_maxno; count++, lp++) {
+	for (lp = lchr; lp->l_name; lp++) {
 	    if (lp->l_tech > tlev)
 		continue;
-	    if (lp->l_name == 0 || lp->l_name[0] == '\0')
-		continue;
 	    lookup_list[lookup_list_cnt].l_u.lp = lp;
 	    lookup_list[lookup_list_cnt].tech = lp->l_tech;
 	    lookup_list_cnt++;
diff --git a/src/server/main.c b/src/server/main.c
index 7e040f1fb..9f6258d2c 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -503,7 +503,7 @@ nullify_objects(void)
 	if (opt_NO_OIL)
 	    plchr[i].pl_fuel = 0;
     }
-    for (i = 0; i < lnd_maxno; i++) {
+    for (i = 0; i < lchr[i].l_name; i++) {
 	if (opt_NO_HCMS)
 	    lchr[i].l_hcm = 0;
 	if (opt_NO_LCMS)
-- 
2.43.0