mirror of
git://git.sv.gnu.org/nano.git
synced 2024-11-22 04:41:21 +03:00
Eliding the function nfreeregex(), now used just once.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5688 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
parent
e74a4c26c0
commit
2134212fa9
@ -7,6 +7,7 @@
|
||||
* src/color.c (color_update): Strip things bare to see the sameness.
|
||||
* src/color.c (found_in_list): Factor out this triple repetition.
|
||||
* src/color.c (color_update): Rename a variable for conciseness.
|
||||
* src/color.c (nfreeregex): Elide this function, now used just once.
|
||||
|
||||
GNU nano 2.5.3 - 2016.02.25
|
||||
|
||||
|
17
src/color.c
17
src/color.c
@ -139,16 +139,6 @@ void color_init(void)
|
||||
}
|
||||
}
|
||||
|
||||
/* Clean up a regex we previously compiled. */
|
||||
void nfreeregex(regex_t **r)
|
||||
{
|
||||
assert(r != NULL);
|
||||
|
||||
regfree(*r);
|
||||
free(*r);
|
||||
*r = NULL;
|
||||
}
|
||||
|
||||
/* Try to match the given shibboleth string with one of the regexes in
|
||||
* the list starting at head. Return TRUE upon success. */
|
||||
bool found_in_list(regexlisttype *head, const char *shibboleth)
|
||||
@ -167,8 +157,11 @@ bool found_in_list(regexlisttype *head, const char *shibboleth)
|
||||
if (regexec(item->ext, shibboleth, 0, NULL, 0) == 0)
|
||||
return TRUE;
|
||||
|
||||
if (not_compiled)
|
||||
nfreeregex(&item->ext);
|
||||
if (not_compiled) {
|
||||
regfree(item->ext);
|
||||
free(item->ext);
|
||||
item->ext = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
|
Loading…
Reference in New Issue
Block a user