From: SHIRAKATA Kentaro <argrath@ub32.org>
Date: Tue, 8 Feb 2022 19:57:37 +0000 (+0900)
Subject: remove unnecessary null-check on wc_set_window_colors()
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a79d4195a69c5621255e24e7fefdf40d53e4c39;p=nethack

remove unnecessary null-check on wc_set_window_colors()

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.
---

diff --git a/src/options.c b/src/options.c
index ec21d5745..2a65d1110 100644
--- a/src/options.c
+++ b/src/options.c
@@ -8702,7 +8702,7 @@ wc_set_window_colors(char *op)
 
     Strcpy(buf, op);
     newop = mungspaces(buf);
-    while (newop && *newop) {
+    while (*newop) {
         wn = tfg = tbg = (char *) 0;
 
         /* 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) {
             if (!strcmpi(wn, wnames[j]) || !strcmpi(wn, shortnames[j])) {
-                if (tfg && !strstri(tfg, " ")) {
+                if (!strstri(tfg, " ")) {
                     if (*fgp[j])
                         free((genericptr_t) *fgp[j]);
                     *fgp[j] = dupstr(tfg);
                 }
-                if (tbg && !strstri(tbg, " ")) {
+                if (!strstri(tbg, " ")) {
                     if (*bgp[j])
                         free((genericptr_t) *bgp[j]);
                     *bgp[j] = dupstr(tbg);