nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Add streq() and start finding places it fixes warnings.

Browse Source 
Some type fixes from Michael Allison.
This commit is contained in:
nhkeni
2022-03-16 18:50:17 -04:00
parent dc72e07a2b
commit 7f484815e5
8 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mondata.c
View File

@@ -860,20 +860,20 @@ name_to_monplus(
for (len = 0, i = LOW_PM; i < NUMMONS; i++) {
for (mgend = MALE; mgend < NUM_MGENDERS; mgend++) {
int m_i_len;
size_t m_i_len;
if (!mons[i].pmnames[mgend])
continue;
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 == (int) slen) {
m_i_len = strlen(mons[i].pmnames[mgend]);
if (m_i_len > (size_t) len && !strncmpi(mons[i].pmnames[mgend], str, (int) m_i_len)) {
if (m_i_len == slen) {
mntmp = i;
len = m_i_len;
len = (int) m_i_len;
matchgend = mgend;
exact_match = TRUE;
break; /* exact match */
} else if ((int) slen > m_i_len
} else if (slen > m_i_len
&& (str[m_i_len] == ' '
|| !strcmpi(&str[m_i_len], "s")
|| !strncmpi(&str[m_i_len], "s ", 2)
@@ -884,7 +884,7 @@ name_to_monplus(
|| !strcmpi(&str[m_i_len], "es")
|| !strncmpi(&str[m_i_len], "es ", 3))) {
mntmp = i;
len = m_i_len;
len = (int) m_i_len;
matchgend = mgend;
}
}