External/libvirt
1
0
Fork 0
Code

conf: convert over to use GRegex for regular expressions

Browse Source 
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2019-09-20 15:01:41 +01:00
parent 9c999bf804
commit 71efb59a4d
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/conf/domain_event.c
View File

@ -22,8 +22,6 @@
#include <config.h> #include <config.h>
#include <regex.h>
#include "domain_event.h" #include "domain_event.h"
#include "object_event.h" #include "object_event.h"
#include "object_event_private.h" #include "object_event_private.h"
@ -2009,7 +2007,7 @@ virDomainQemuMonitorEventNew(int id,
* deregisters. */ * deregisters. */
struct virDomainQemuMonitorEventData { struct virDomainQemuMonitorEventData {
char *event; char *event;
regex_t regex; GRegex *regex;
unsigned int flags; unsigned int flags;
void *opaque; void *opaque;
virFreeCallback freecb; virFreeCallback freecb;
@ -2241,7 +2239,7 @@ virDomainQemuMonitorEventFilter(virConnectPtr conn ATTRIBUTE_UNUSED,
if (data->flags == -1) if (data->flags == -1)
return true; return true;
if (data->flags & VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_REGEX) if (data->flags & VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_REGEX)
return regexec(&data->regex, monitorEvent->event, 0, NULL, 0) == 0; return g_regex_match(data->regex, monitorEvent->event, 0, NULL) == TRUE;
if (data->flags & VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_NOCASE) if (data->flags & VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_NOCASE)
return STRCASEEQ(monitorEvent->event, data->event); return STRCASEEQ(monitorEvent->event, data->event);
return STREQ(monitorEvent->event, data->event); return STREQ(monitorEvent->event, data->event);
@ -2255,7 +2253,7 @@ virDomainQemuMonitorEventCleanup(void *opaque)
VIR_FREE(data->event); VIR_FREE(data->event);
if (data->flags & VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_REGEX) if (data->flags & VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_REGEX)
regfree(&data->regex); g_regex_unref(data->regex);
if (data->freecb) if (data->freecb)
(data->freecb)(data->opaque); (data->freecb)(data->opaque);
VIR_FREE(data); VIR_FREE(data);
@ -2306,20 +2304,17 @@ virDomainQemuMonitorEventStateRegisterID(virConnectPtr conn,
return -1; return -1;
data->flags = flags; data->flags = flags;
if (event && flags != -1) { if (event && flags != -1) {
int rflags = REG_NOSUB;
if (flags & VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_NOCASE)
rflags |= REG_ICASE;
if (flags & VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_REGEX) { if (flags & VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_REGEX) {
int err = regcomp(&data->regex, event, rflags); int cflags = G_REGEX_OPTIMIZE;
g_autoptr(GError) err = NULL;
if (err) { if (flags & VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_NOCASE)
char error[100]; cflags |= G_REGEX_CASELESS;
regerror(err, &data->regex, error, sizeof(error)); data->regex = g_regex_new(event, cflags, 0, &err);
if (!data->regex) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("failed to compile regex '%s': %s"), _("failed to compile regex '%s': %s"),
event, error); event, err->message);
regfree(&data->regex);
VIR_FREE(data); VIR_FREE(data);
return -1; return -1;
} }