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

followup to PR #744

Browse Source 
Pull some pointer assignments in wc_set_window_colors() out of
if-else-endif so that it is more obvious that they can't be Null.
This commit is contained in:
PatR
2022-04-24 00:26:50 -07:00
parent 3f6e371a4e
commit 9054f97b41
1 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/options.c
+14 -19
View File
@@ -8689,7 +8689,9 @@ wc_set_window_colors(char *op)
int j; int j;
char buf[BUFSZ]; char buf[BUFSZ];
char *wn, *tfg, *tbg, *newop; char *wn, *tfg, *tbg, *newop;
static const char *const wnames[] = { "menu", "message", "status", "text" }; static const char *const wnames[] = {
"menu", "message", "status", "text"
};
static const char *const shortnames[] = { "mnu", "msg", "sts", "txt" }; static const char *const shortnames[] = { "mnu", "msg", "sts", "txt" };
static char **fgp[] = { &iflags.wc_foregrnd_menu, static char **fgp[] = { &iflags.wc_foregrnd_menu,
&iflags.wc_foregrnd_message, &iflags.wc_foregrnd_message,
@@ -8706,48 +8708,41 @@ wc_set_window_colors(char *op)
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
* colorname*/ colorname*/
if (*newop == ' ') if (*newop == ' ')
newop++; newop++;
if (*newop) if (!*newop)
wn = newop;
else
return 0; return 0;
wn = newop;
/* until first space - colorname*/ /* until first space - colorname*/
while (*newop && *newop != ' ') while (*newop && *newop != ' ')
newop++; newop++;
if (*newop) if (!*newop)
*newop = '\0';
else
return 0; return 0;
newop++; *newop++ = '\0';
/* until first non-space - before foreground*/ /* until first non-space - before foreground*/
if (*newop == ' ') if (*newop == ' ')
newop++; newop++;
if (*newop) if (!*newop)
tfg = newop;
else
return 0; return 0;
tfg = newop;
/* until slash - foreground */ /* until slash - foreground */
while (*newop && *newop != '/') while (*newop && *newop != '/')
newop++; newop++;
if (*newop) if (!*newop)
*newop = '\0';
else
return 0; return 0;
newop++; *newop++ = '\0';
/* until first non-space (in case there's leading space after slash) - /* until first non-space (in case there's leading space after slash) -
* before background */ * before background */
if (*newop == ' ') if (*newop == ' ')
newop++; newop++;
if (*newop) if (!*newop)
tbg = newop;
else
return 0; return 0;
tbg = newop;
/* until first space - background */ /* until first space - background */
while (*newop && *newop != ' ') while (*newop && *newop != ' ')