From 81b014977d0694ffa0dab46087cd7833f498319d Mon Sep 17 00:00:00 2001
From: nhkeni <keni@his.com>
Date: Wed, 16 Mar 2022 17:49:29 -0400
Subject: [PATCH] Some easy loss-of-precision fixes.

---
 src/bones.c   |  2 +-
 src/botl.c    | 14 ++++++++------
 src/end.c     |  2 +-
 src/engrave.c |  2 +-
 src/invent.c  |  2 +-
 src/mondata.c |  7 ++++---
 6 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/bones.c b/src/bones.c
index 54eeb0dd6..5326e08df 100644
--- a/src/bones.c
+++ b/src/bones.c
@@ -690,7 +690,7 @@ boolean
 bones_include_name(const char *name)
 {
     struct cemetery *bp;
-    int len;
+    size_t len;
     char buf[BUFSZ];
 
     /* prepare buffer by appending terminal hyphen to name, to avoid partial
diff --git a/src/botl.c b/src/botl.c
index 8ec54885d..6d1b1d18d 100644
--- a/src/botl.c
+++ b/src/botl.c
@@ -111,7 +111,7 @@ do_statusline2(void)
             time (in moves), varying number of status conditions */
          dloc[QBUFSZ], hlth[QBUFSZ], expr[QBUFSZ], tmmv[QBUFSZ], cond[QBUFSZ];
     register char *nb;
-    unsigned dln, dx, hln, xln, tln, cln;
+    size_t dln, dx, hln, xln, tln, cln;
     int hp, hpmax, cap;
     long money;
 
@@ -227,7 +227,7 @@ do_statusline2(void)
     } else {
         if (dln + 1 + hln + 1 + xln + 1 + tln + 1 + cln + 1 > MAXCO) {
             panic("bot2: second status line exceeds MAXCO (%u > %d)",
-                  (dln + 1 + hln + 1 + xln + 1 + tln + 1 + cln + 1), MAXCO);
+                  (unsigned)(dln + 1 + hln + 1 + xln + 1 + tln + 1 + cln + 1), MAXCO);
         } else if ((dln - dx) + 1 + hln + 1 + xln + 1 + cln <= COLNO) {
             Snprintf(newbot2, sizeof(newbot2), "%s %s %s %s %s", dloc, hlth,
                      expr, cond, tmmv);
@@ -391,14 +391,15 @@ title_to_mon(const char *str, int *rank_indx, int *title_length)
 void
 max_rank_sz(void)
 {
-    register int i, r, maxr = 0;
+    register int i;
+    size_t r, maxr = 0;
     for (i = 0; i < 9; i++) {
         if (g.urole.rank[i].m && (r = strlen(g.urole.rank[i].m)) > maxr)
             maxr = r;
         if (g.urole.rank[i].f && (r = strlen(g.urole.rank[i].f)) > maxr)
             maxr = r;
     }
-    g.mrank_sz = maxr;
+    g.mrank_sz = (int) maxr;
     return;
 }
 
@@ -2929,7 +2930,8 @@ hlattr2attrname(int attrib, char *buf, int bufsz)
 {
     if (attrib && buf) {
         char attbuf[BUFSZ];
-        int k, first = 0;
+        int first = 0;
+        size_t k;
 
         attbuf[0] = '\0';
         if (attrib == HL_NONE) {
@@ -2949,7 +2951,7 @@ hlattr2attrname(int attrib, char *buf, int bufsz)
             Strcat(attbuf, first++ ? "+dim" : "dim");
 
         k = strlen(attbuf);
-        if (k < (bufsz - 1))
+        if (k < (size_t)(bufsz - 1))
             Strcpy(buf, attbuf);
         return buf;
     }
diff --git a/src/end.c b/src/end.c
index bf1f92ea6..c3b371613 100644
--- a/src/end.c
+++ b/src/end.c
@@ -207,7 +207,7 @@ NH_panictrace_libc(void)
 {
 #ifdef PANICTRACE_LIBC
     void *bt[20];
-    size_t count, x;
+    int count, x;
     char **info, buf[BUFSZ];
 
     raw_print("  Generating more information you may report:\n");
diff --git a/src/engrave.c b/src/engrave.c
index f290b80d4..7b9573781 100644
--- a/src/engrave.c
+++ b/src/engrave.c
@@ -535,7 +535,7 @@ doengrave(void)
     const char *everb;          /* Present tense of engraving type */
     const char *eloc; /* Where the engraving is (ie dust/floor/...) */
     char *sp;         /* Place holder for space count of engr text */
-    int len;          /* # of nonspace chars of new engraving text */
+    size_t len;          /* # of nonspace chars of new engraving text */
     struct engr *oep = engr_at(u.ux, u.uy);
     /* The current engraving */
     struct obj *otmp; /* Object selected with which to engrave */
diff --git a/src/invent.c b/src/invent.c
index 569bb6eaf..4231c8dee 100644
--- a/src/invent.c
+++ b/src/invent.c
@@ -3622,7 +3622,7 @@ stackobj(struct obj *obj)
 boolean
 mergable(register struct obj *otmp, register struct obj *obj)
 {
-    int objnamelth = 0, otmpnamelth = 0;
+    size_t objnamelth = 0, otmpnamelth = 0;
 
     /* fail if already the same object, if different types, if either is
        explicitly marked to prevent merge, or if not mergable in general */
diff --git a/src/mondata.c b/src/mondata.c
index b8b31b231..138919340 100644
--- a/src/mondata.c
+++ b/src/mondata.c
@@ -736,7 +736,8 @@ name_to_monplus(
     register int mntmp = NON_PM;
     register char *s, *str, *term;
     char buf[BUFSZ];
-    int len, slen, mgend, matchgend = -1;
+    int len, mgend, matchgend = -1;
+    size_t slen;
     boolean exact_match = FALSE;
 
     if (remainder_p)
@@ -866,13 +867,13 @@ name_to_monplus(
 
         m_i_len = (int) strlen(mons[i].pmnames[mgend]);
         if (m_i_len > len && !strncmpi(mons[i].pmnames[mgend], str, m_i_len)) {
-            if (m_i_len == slen) {
+            if (m_i_len == (int) slen) {
                 mntmp = i;
                 len = m_i_len;
                 matchgend = mgend;
                 exact_match = TRUE;
                 break; /* exact match */
-            } else if (slen > m_i_len
+            } else if ((int) slen > m_i_len
                        && (str[m_i_len] == ' '
                            || !strcmpi(&str[m_i_len], "s")
                            || !strncmpi(&str[m_i_len], "s ", 2)