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

remove unnecessary null checks from christen_monst

Browse Source 
Closes #681
This commit is contained in:
nhmall
2022-02-11 09:08:31 -05:00
parent 7c1dba3f0b
commit 5faace8b9e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/fixes3-7-0.txt
View File

@@ -1537,7 +1537,8 @@ function savelev() in save.c was dereferencing a NHFILE pointer for
function tin_details() in eat.c was passing an obj pointer to function tin_details() in eat.c was passing an obj pointer to
tin_variety() where it was dereferenced; move the tin_details() tin_variety() where it was dereferenced; move the tin_details()
NULL check above that tin_variety() call (pr #676 by argrath) NULL check above that tin_variety() call (pr #676 by argrath)
remove unnecessary null checks from christen_orc() (pr #681 by argrath)
Code Cleanup and Reorganization Code Cleanup and Reorganization
------------------------------- -------------------------------

2
src/do_name.c
View File

@@ -2415,7 +2415,7 @@ christen_orc(struct monst *mtmp, const char *gang, const char *other)
char buf[BUFSZ], buf2[BUFSZ], *orcname; char buf[BUFSZ], buf2[BUFSZ], *orcname;
orcname = rndorcname(buf2); orcname = rndorcname(buf2);
/* orcname is never NULL */ /* rndorcname() won't return NULL */
sz = (int) strlen(orcname); sz = (int) strlen(orcname);
if (gang) if (gang)
sz += (int) (strlen(gang) + sizeof " of " - sizeof ""); sz += (int) (strlen(gang) + sizeof " of " - sizeof "");