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

tweaks: reshuffle three lines and elide braces after the previous change

master
Benno Schulenberg 2020-10-21 11:21:11 +02:00
parent e96bda4b9f
commit de313586ab
1 changed files with 12 additions and 13 deletions

25
src/rcfile.c
View File

@ -1200,12 +1200,11 @@ colortype *parse_interface_color(char *combostr)
{ {
colortype *trio = nmalloc(sizeof(colortype)); colortype *trio = nmalloc(sizeof(colortype));
if (parse_combination(combostr, &trio->fg, &trio->bg, &trio->attributes)) { if (!parse_combination(combostr, &trio->fg, &trio->bg, &trio->attributes)) {
return trio;
} else {
free(trio); free(trio);
return NULL; return NULL;
} } else
return trio;
} }
/* Read regex strings enclosed in double quotes from the line pointed at /* Read regex strings enclosed in double quotes from the line pointed at
@ -1580,16 +1579,16 @@ void parse_rcfile(FILE *rcstream, bool just_syntax, bool intros_only)
#endif #endif
#ifndef NANO_TINY #ifndef NANO_TINY
if (strcmp(option, "matchbrackets") == 0) { if (strcmp(option, "matchbrackets") == 0) {
if (has_blank_char(argument)) { if (has_blank_char(argument))
jot_error(N_("Non-blank characters required")); jot_error(N_("Non-blank characters required"));
} else if (mbstrlen(argument) % 2 != 0) { else if (mbstrlen(argument) % 2 != 0)
jot_error(N_("Even number of characters required")); jot_error(N_("Even number of characters required"));
} else else
matchbrackets = copy_of(argument); matchbrackets = copy_of(argument);
} else if (strcmp(option, "whitespace") == 0) { } else if (strcmp(option, "whitespace") == 0) {
if (mbstrlen(argument) != 2 || breadth(argument) != 2) { if (mbstrlen(argument) != 2 || breadth(argument) != 2)
jot_error(N_("Two single-column characters required")); jot_error(N_("Two single-column characters required"));
} else { else {
whitespace = copy_of(argument); whitespace = copy_of(argument);
whitelen[0] = char_length(whitespace); whitelen[0] = char_length(whitespace);
whitelen[1] = char_length(whitespace + whitelen[0]); whitelen[1] = char_length(whitespace + whitelen[0]);
@ -1598,14 +1597,14 @@ void parse_rcfile(FILE *rcstream, bool just_syntax, bool intros_only)
#endif #endif
#ifdef ENABLE_JUSTIFY #ifdef ENABLE_JUSTIFY
if (strcmp(option, "punct") == 0) { if (strcmp(option, "punct") == 0) {
if (has_blank_char(argument)) { if (has_blank_char(argument))
jot_error(N_("Non-blank characters required")); jot_error(N_("Non-blank characters required"));
} else else
punct = copy_of(argument); punct = copy_of(argument);
} else if (strcmp(option, "brackets") == 0) { } else if (strcmp(option, "brackets") == 0) {
if (has_blank_char(argument)) { if (has_blank_char(argument))
jot_error(N_("Non-blank characters required")); jot_error(N_("Non-blank characters required"));
} else else
brackets = copy_of(argument); brackets = copy_of(argument);
} else if (strcmp(option, "quotestr") == 0) } else if (strcmp(option, "quotestr") == 0)
quotestr = copy_of(argument); quotestr = copy_of(argument);