External/libvirt
1
0
Fork 0
Code

util: use GRegex in virStringMatch

Browse Source 
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Ján Tomko 2019-11-13 16:01:19 +01:00
parent 9c76dd3a2e
commit b96e0dbba9
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/util/virstring.c
View File

@ -19,7 +19,6 @@
#include <config.h> #include <config.h>
#include <glib/gprintf.h> #include <glib/gprintf.h>
#include <regex.h>
#include <locale.h> #include <locale.h>
#include "c-ctype.h" #include "c-ctype.h"
@ -1089,24 +1088,18 @@ bool
virStringMatch(const char *str, virStringMatch(const char *str,
const char *regexp) const char *regexp)
{ {
regex_t re; g_autoptr(GRegex) regex = NULL;
int rv; g_autoptr(GError) err = NULL;
VIR_DEBUG("match '%s' for '%s'", str, regexp); VIR_DEBUG("match '%s' for '%s'", str, regexp);
if ((rv = regcomp(&re, regexp, REG_EXTENDED | REG_NOSUB)) != 0) { regex = g_regex_new(regexp, 0, 0, &err);
char error[100]; if (!regex) {
regerror(rv, &re, error, sizeof(error)); VIR_WARN("Failed to compile regex %s", err->message);
VIR_WARN("error while compiling regular expression '%s': %s",
regexp, error);
return false; return false;
} }
rv = regexec(&re, str, 0, NULL, 0); return g_regex_match(regex, str, 0, NULL);
regfree(&re);
return rv == 0;
} }
/** /**