From 0253d145e9f6ac9f749691c5f168ea663c43af79 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Fri, 15 Dec 2023 15:57:50 +0100 Subject: [PATCH] testCompareDomXML2XMLFiles: Sanitize handling of 'parse_flags' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Get rid of the extra temporary variable and set the parse and format flags based on liveness together. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- tests/testutils.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/testutils.c b/tests/testutils.c index 6ee78cca3c..8d4e7f84bf 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -1045,25 +1045,24 @@ int testCompareDomXML2XMLFiles(virCaps *caps G_GNUC_UNUSED, virDomainXMLOption *xmlopt, const char *infile, const char *outfile, bool live, - unsigned int parseFlags, + unsigned int parse_flags, testCompareDomXML2XMLResult expectResult) { g_autofree char *actual = NULL; int ret = -1; testCompareDomXML2XMLResult result; g_autoptr(virDomainDef) def = NULL; - unsigned int parse_flags = live ? 0 : VIR_DOMAIN_DEF_PARSE_INACTIVE; unsigned int format_flags = VIR_DOMAIN_DEF_FORMAT_SECURE; - parse_flags |= parseFlags; - if (!virFileExists(infile)) { VIR_TEST_DEBUG("Test input file '%s' is missing", infile); return -1; } - if (!live) + if (!live) { format_flags |= VIR_DOMAIN_DEF_FORMAT_INACTIVE; + parse_flags |= VIR_DOMAIN_DEF_PARSE_INACTIVE; + } if (!(def = virDomainDefParseFile(infile, xmlopt, NULL, parse_flags))) { result = TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE;