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

tweaks: rename a variable, chuck an assert, and frob a comment

master
Benno Schulenberg 2017-01-02 20:25:24 +01:00
parent 991e49a36a
commit 0b0ddb1e5f
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/search.c
View File

@ -39,22 +39,19 @@ static bool history_changed = FALSE;
static bool regexp_compiled = FALSE; static bool regexp_compiled = FALSE;
/* Have we compiled any regular expressions? */ /* Have we compiled any regular expressions? */
/* Compile the regular expression regexp to see if it's valid. Return /* Compile the given regular expression and store it in search_regexp.
* TRUE if it is, or FALSE otherwise. */ * Return TRUE if the expression is valid, and FALSE otherwise. */
bool regexp_init(const char *regexp) bool regexp_init(const char *regexp)
{ {
int rc; int value = regcomp(&search_regexp, fixbounds(regexp),
assert(!regexp_compiled);
rc = regcomp(&search_regexp, fixbounds(regexp),
NANO_REG_EXTENDED | (ISSET(CASE_SENSITIVE) ? 0 : REG_ICASE)); NANO_REG_EXTENDED | (ISSET(CASE_SENSITIVE) ? 0 : REG_ICASE));
if (rc != 0) { /* If regex compilation failed, show the error message. */
size_t len = regerror(rc, &search_regexp, NULL, 0); if (value != 0) {
size_t len = regerror(value, &search_regexp, NULL, 0);
char *str = charalloc(len); char *str = charalloc(len);
regerror(rc, &search_regexp, str, len); regerror(value, &search_regexp, str, len);
statusline(ALERT, _("Bad regex \"%s\": %s"), regexp, str); statusline(ALERT, _("Bad regex \"%s\": %s"), regexp, str);
free(str); free(str);