ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: reshuffle some stuff, and avoid a memory leak

master
Benno Schulenberg 2018-01-15 13:06:35 +01:00
parent 4b24ce1c11
commit 2ff398c685
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/rcfile.c
View File

@ -774,22 +774,21 @@ bool parse_color_names(char *combostr, short *fg, short *bg, bool *bright)
return TRUE; return TRUE;
} }
/* Parse interface color options. */ /* Parse the argument of an interface color option. */
colortype *parse_interface_color(char *combostr) colortype *parse_interface_color(char *combostr)
{ {
short fg, bg; colortype *trio = nmalloc(sizeof(colortype));
bool bright = FALSE;
colortype *newcolor;
if (!parse_color_names(combostr, &fg, &bg, &bright)) trio->bright = FALSE;
if (parse_color_names(combostr, &trio->fg, &trio->bg, &trio->bright)) {
free(combostr);
return trio;
} else {
free(combostr);
free(trio);
return NULL; return NULL;
}
newcolor = (colortype *)nmalloc(sizeof(colortype));
newcolor->fg = fg;
newcolor->bg = bg;
newcolor->bright = bright;
return newcolor;
} }
/* Read regex strings enclosed in double quotes from the line pointed at /* Read regex strings enclosed in double quotes from the line pointed at