[libvirt] [PATCH 12/12] tests: use GRegex in vboxsnapshotxmltest
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
tests/vboxsnapshotxmltest.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/tests/vboxsnapshotxmltest.c b/tests/vboxsnapshotxmltest.c
index 8faf2b9c26..d1a7522931 100644
--- a/tests/vboxsnapshotxmltest.c
+++ b/tests/vboxsnapshotxmltest.c
@@ -4,7 +4,6 @@
#ifdef WITH_VBOX
-# include <regex.h>
# include "vbox/vbox_snapshot_conf.h"
# define VIR_FROM_THIS VIR_FROM_NONE
@@ -12,7 +11,7 @@
static const char *testSnapshotXMLVariableLineRegexStr =
"lastStateChange=[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z";
-regex_t *testSnapshotXMLVariableLineRegex = NULL;
+GRegex *testSnapshotXMLVariableLineRegex = NULL;
static char *
testFilterXML(char *xml)
@@ -29,8 +28,7 @@ testFilterXML(char *xml)
VIR_FREE(xml);
for (xmlLine = xmlLines; *xmlLine; xmlLine++) {
- if (regexec(testSnapshotXMLVariableLineRegex,
- *xmlLine, 0, NULL, 0) == 0)
+ if (g_regex_match(testSnapshotXMLVariableLineRegex, *xmlLine, 0, NULL))
continue;
virBufferStrcat(&buf, *xmlLine, "\n", NULL);
@@ -112,12 +110,12 @@ static int
mymain(void)
{
int ret = 0;
- if (VIR_ALLOC(testSnapshotXMLVariableLineRegex) < 0)
- goto cleanup;
+ g_autoptr(GError) err = NULL;
+
+ testSnapshotXMLVariableLineRegex = g_regex_new(testSnapshotXMLVariableLineRegexStr,
+ 0, 0, &err);
- if (regcomp(testSnapshotXMLVariableLineRegex,
- testSnapshotXMLVariableLineRegexStr,
- REG_EXTENDED | REG_NOSUB) != 0) {
+ if (!testSnapshotXMLVariableLineRegex) {
ret = -1;
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
"failed to compile test regex");
@@ -136,9 +134,7 @@ mymain(void)
DO_TEST("2disks-3snap-brother");
cleanup:
- if (testSnapshotXMLVariableLineRegex)
- regfree(testSnapshotXMLVariableLineRegex);
- VIR_FREE(testSnapshotXMLVariableLineRegex);
+ g_regex_unref(testSnapshotXMLVariableLineRegex);
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
}
--
2.21.0