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

remove redundant null-check on christen_orc()

Browse Source 
rndorcname() returns buf2 itself, so orcname is never NULL.
This commit is contained in:
SHIRAKATA Kentaro
2022-02-09 03:17:53 +09:00
parent 880590ef0b
commit 7c1dba3f0b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/do_name.c
View File

@@ -2415,6 +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 */
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 "");
@@ -2425,11 +2426,11 @@ christen_orc(struct monst *mtmp, const char *gang, const char *other)
char gbuf[BUFSZ]; char gbuf[BUFSZ];
boolean nameit = FALSE; boolean nameit = FALSE;
if (gang && orcname) { if (gang) {
Sprintf(buf, "%s of %s", upstart(orcname), Sprintf(buf, "%s of %s", upstart(orcname),
upstart(strcpy(gbuf, gang))); upstart(strcpy(gbuf, gang)));
nameit = TRUE; nameit = TRUE;
} else if (other && orcname) { } else if (other) {
Sprintf(buf, "%s%s", upstart(orcname), other); Sprintf(buf, "%s%s", upstart(orcname), other);
nameit = TRUE; nameit = TRUE;
} }