External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

libxl: use GRegex in libxlGetAutoballoonConf

Browse Source 
Replace the use of regcomp with GRegex.

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 12:59:55 +01:00
parent 5c89468ff2
commit 77d228468d
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/libxl/libxl_conf.c
View File

@ -22,7 +22,6 @@
#include <config.h> #include <config.h>
#include <regex.h>
#include <libxl.h> #include <libxl.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -1664,7 +1663,8 @@ static int
libxlGetAutoballoonConf(libxlDriverConfigPtr cfg, libxlGetAutoballoonConf(libxlDriverConfigPtr cfg,
virConfPtr conf) virConfPtr conf)
{ {
regex_t regex; g_autoptr(GRegex) regex = NULL;
g_autoptr(GError) err = NULL;
int res; int res;
res = virConfGetValueBool(conf, "autoballoon", &cfg->autoballoon); res = virConfGetValueBool(conf, "autoballoon", &cfg->autoballoon);
@ -1673,21 +1673,15 @@ libxlGetAutoballoonConf(libxlDriverConfigPtr cfg,
else if (res == 1) else if (res == 1)
return 0; return 0;
if ((res = regcomp(&regex, regex = g_regex_new("(^| )dom0_mem=((|min:|max:)[0-9]+[bBkKmMgG]?,?)+($| )",
"(^| )dom0_mem=((|min:|max:)[0-9]+[bBkKmMgG]?,?)+($| )", 0, 0, &err);
REG_NOSUB | REG_EXTENDED)) != 0) { if (!regex) {
char error[100];
regerror(res, &regex, error, sizeof(error));
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to compile regex %s"), _("Failed to compile regex %s"), err->message);
error);
return -1; return -1;
} }
res = regexec(&regex, cfg->verInfo->commandline, 0, NULL, 0); cfg->autoballoon = !g_regex_match(regex, cfg->verInfo->commandline, 0, NULL);
regfree(&regex);
cfg->autoballoon = res == REG_NOMATCH;
return 0; return 0;
} }