zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-11 21:00:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

switch for gregex and regex.h

Browse source
This commit is contained in:
Ailin Nemui 2017-01-03 12:04:56 +01:00
commit f5cbbebc2e
8 changed files with 133 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/core/ignore.c
View file

@ -67,8 +67,13 @@ static int ignore_match_pattern(IGNORE_REC *rec, const char *text)
return FALSE;
if (rec->regexp) {
#ifdef USE_GREGEX
return rec->preg != NULL &&
g_regex_match(rec->preg, text, 0, NULL);
#else
return rec->regexp_compiled &&
regexec(&rec->preg, text, 0, NULL, 0) == 0;
#endif
}
return rec->fullword ?
@ -322,6 +327,7 @@ static void ignore_remove_config(IGNORE_REC *rec)
static void ignore_init_rec(IGNORE_REC *rec)
{
#ifdef USE_GREGEX
if (rec->preg != NULL)
g_regex_unref(rec->preg);
@ -335,6 +341,27 @@ static void ignore_init_rec(IGNORE_REC *rec)
g_error_free(re_error);
}
}
#else
char *errbuf;
int errcode, errbuf_len;
if (rec->regexp_compiled) regfree(&rec->preg);
rec->regexp_compiled = FALSE;
if (rec->regexp && rec->pattern != NULL) {
errcode = regcomp(&rec->preg, rec->pattern,
REG_EXTENDED|REG_ICASE|REG_NOSUB);
if (errcode != 0) {
errbuf_len = regerror(errcode, &rec->preg, 0, 0);
errbuf = g_malloc(errbuf_len);
regerror(errcode, &rec->preg, errbuf, errbuf_len);
g_warning("Failed to compile regexp '%s': %s", rec->pattern, errbuf);
g_free(errbuf);
} else {
rec->regexp_compiled = TRUE;
}
}
#endif
}
void ignore_add_rec(IGNORE_REC *rec)
@ -354,7 +381,11 @@ static void ignore_destroy(IGNORE_REC *rec, int send_signal)
if (send_signal)
signal_emit("ignore destroyed", 1, rec);
#ifdef USE_GREGEX
if (rec->preg != NULL) g_regex_unref(rec->preg);
#else
if (rec->regexp_compiled) regfree(&rec->preg);
#endif
if (rec->channels != NULL) g_strfreev(rec->channels);
g_free_not_null(rec->mask);
g_free_not_null(rec->servertag);