From f86bb9b7b6dc792b6f6ee239ac92245b78c09d78 Mon Sep 17 00:00:00 2001
From: PatR <rankin@nethack.org>
Date: Wed, 22 Jan 2025 13:29:44 -0800
Subject: [PATCH] analysis lint for s*.c

shk.c was dealt with previously.
---
 src/save.c   | 6 +++---
 src/shknam.c | 4 ++--
 src/sp_lev.c | 5 ++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/save.c b/src/save.c
index 933a0b0f8..a178fbdcd 100644
--- a/src/save.c
+++ b/src/save.c
@@ -1,4 +1,4 @@
-/* NetHack 3.7	save.c	$NHDT-Date: 1706079844 2024/01/24 07:04:04 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.214 $ */
+/* NetHack 3.7	save.c	$NHDT-Date: 1737610109 2025/01/22 21:28:29 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.232 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Michael Allison, 2009. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -17,7 +17,7 @@ int dotcnt, dotrow; /* also used in restore */
 #endif
 
 staticfn void savelevchn(NHFILE *);
-staticfn void savelevl(NHFILE *,boolean);
+staticfn void savelevl(NHFILE *, boolean);
 staticfn void savedamage(NHFILE *);
 staticfn void save_bubbles(NHFILE *, xint8);
 staticfn void save_stairs(NHFILE *);
@@ -702,7 +702,7 @@ savedamage(NHFILE *nhfp)
         if (nhfp->structlevel)
             bwrite(nhfp->fd, (genericptr_t) &xl, sizeof xl);
     }
-    while (xl--) {
+    while (damageptr) {
         if (perform_bwrite(nhfp)) {
             if (nhfp->structlevel)
                 bwrite(nhfp->fd, (genericptr_t) damageptr, sizeof *damageptr);
diff --git a/src/shknam.c b/src/shknam.c
index 5aaeefcca..61016d56e 100644
--- a/src/shknam.c
+++ b/src/shknam.c
@@ -411,8 +411,8 @@ shkveg(void)
     char oclass = FOOD_CLASS;
     int ok[NUM_OBJECTS];
 
+    (void) memset((genericptr_t) ok, 0, sizeof ok); /* lint suppression */
     j = maxprob = 0;
-    ok[0] = 0; /* lint suppression */
     for (i = svb.bases[(int) oclass]; i < NUM_OBJECTS; ++i) {
         if (objects[i].oc_class != oclass)
             break;
@@ -511,7 +511,7 @@ nameshk(struct monst *shk, const char *const *nlp)
 
         for (names_avail = 0; nlp[names_avail]; names_avail++)
             continue;
-
+        assert(names_avail > 0);
         name_wanted = name_wanted % names_avail;
 
         for (trycnt = 0; trycnt < 50; trycnt++) {
diff --git a/src/sp_lev.c b/src/sp_lev.c
index 62f83909c..66c6d2c87 100644
--- a/src/sp_lev.c
+++ b/src/sp_lev.c
@@ -1,4 +1,4 @@
-/* NetHack 3.7	sp_lev.c	$NHDT-Date: 1709921020 2024/03/08 18:03:40 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.359 $ */
+/* NetHack 3.7	sp_lev.c	$NHDT-Date: 1737610109 2025/01/22 21:28:29 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.373 $ */
 /*      Copyright (c) 1989 by Jean-Christophe Collet */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -2515,9 +2515,8 @@ search_door(
         yy = croom->ly;
         break;
     default:
-        dx = dy = xx = yy = 0;
         panic("search_door: Bad wall!");
-        break;
+        /*NOTREACHED*/
     }
     while (xx <= croom->hx + 1 && yy <= croom->hy + 1) {
         if (IS_DOOR(levl[xx][yy].typ) || levl[xx][yy].typ == SDOOR) {