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

remove unnecessary null-check on wc_set_window_colors()

Browse Source 
mungspaces() returns its argument itself, so `newop` is assigned to `buf`, and always non-null.
`tfg` and `tbg` is assigned to (some addition of) `newop`, so these are also always non-null.
This commit is contained in:
SHIRAKATA Kentaro
2022-04-24 00:08:52 -07:00
committed by PatR
parent 6bc52ebb77
commit 4a79d4195a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/options.c
+3 -3
View File
@@ -8702,7 +8702,7 @@ wc_set_window_colors(char *op)
Strcpy(buf, op); Strcpy(buf, op);
newop = mungspaces(buf); newop = mungspaces(buf);
while (newop && *newop) { while (*newop) {
wn = tfg = tbg = (char *) 0; wn = tfg = tbg = (char *) 0;
/* until first non-space in case there's leading spaces - before /* until first non-space in case there's leading spaces - before
@@ -8757,12 +8757,12 @@ wc_set_window_colors(char *op)
for (j = 0; j < 4; ++j) { for (j = 0; j < 4; ++j) {
if (!strcmpi(wn, wnames[j]) || !strcmpi(wn, shortnames[j])) { if (!strcmpi(wn, wnames[j]) || !strcmpi(wn, shortnames[j])) {
if (tfg && !strstri(tfg, " ")) { if (!strstri(tfg, " ")) {
if (*fgp[j]) if (*fgp[j])
free((genericptr_t) *fgp[j]); free((genericptr_t) *fgp[j]);
*fgp[j] = dupstr(tfg); *fgp[j] = dupstr(tfg);
} }
if (tbg && !strstri(tbg, " ")) { if (!strstri(tbg, " ")) {
if (*bgp[j]) if (*bgp[j])
free((genericptr_t) *bgp[j]); free((genericptr_t) *bgp[j]);
*bgp[j] = dupstr(tbg); *bgp[j] = dupstr(tbg);