10:01 a.m.
This function doesn't follow our convention of naming functions.
---
tests/domainsnapshotxml2xmltest.c | 2 +-
tests/interfacexml2xmltest.c | 2 +-
tests/nodedevxml2xmltest.c | 2 +-
tests/qemuhotplugtest.c | 6 +++---
tests/testutils.c | 16 ++++++++--------
tests/testutils.h | 10 +++++-----
6 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/tests/domainsnapshotxml2xmltest.c b/tests/domainsnapshotxml2xmltest.c
index 8195e22..650c565 100644
--- a/tests/domainsnapshotxml2xmltest.c
+++ b/tests/domainsnapshotxml2xmltest.c
@@ -114,7 +114,7 @@ testCompareXMLToXMLFiles(const char *inxml,
}
if (STRNEQ(outXmlData, actual)) {
- virtTestDifferenceFull(stderr, outXmlData, outxml, actual, inxml);
+ virTestDifferenceFull(stderr, outXmlData, outxml, actual, inxml);
goto cleanup;
}
diff --git a/tests/interfacexml2xmltest.c b/tests/interfacexml2xmltest.c
index a2ebf16..5e3525e 100644
--- a/tests/interfacexml2xmltest.c
+++ b/tests/interfacexml2xmltest.c
@@ -34,7 +34,7 @@ testCompareXMLToXMLFiles(const char *xml)
goto fail;
if (STRNEQ(xmlData, actual)) {
- virtTestDifferenceFull(stderr, xmlData, xml, actual, NULL);
+ virTestDifferenceFull(stderr, xmlData, xml, actual, NULL);
goto fail;
}
diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c
index cd8bf8a..eb32dd3 100644
--- a/tests/nodedevxml2xmltest.c
+++ b/tests/nodedevxml2xmltest.c
@@ -34,7 +34,7 @@ testCompareXMLToXMLFiles(const char *xml)
goto fail;
if (STRNEQ(xmlData, actual)) {
- virtTestDifferenceFull(stderr, xmlData, xml, actual, NULL);
+ virTestDifferenceFull(stderr, xmlData, xml, actual, NULL);
goto fail;
}
diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index 68279d0..447fb75 100644
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -192,9 +192,9 @@ testQemuHotplugCheckResult(virDomainObjPtr vm,
ret = 0;
} else {
if (!fail)
- virtTestDifferenceFull(stderr,
- expected, expectedFile,
- actual, NULL);
+ virTestDifferenceFull(stderr,
+ expected, expectedFile,
+ actual, NULL);
ret = -1;
}
diff --git a/tests/testutils.c b/tests/testutils.c
index 256ebde..0e9ade7 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -565,11 +565,11 @@ virtTestDifferenceFullInternal(FILE *stream,
* regenerate the expected file.
*/
int
-virtTestDifferenceFull(FILE *stream,
- const char *expect,
- const char *expectName,
- const char *actual,
- const char *actualName)
+virTestDifferenceFull(FILE *stream,
+ const char *expect,
+ const char *expectName,
+ const char *actual,
+ const char *actualName)
{
return virtTestDifferenceFullInternal(stream, expect, expectName,
actual, actualName, true);
@@ -705,9 +705,9 @@ virTestCompareToFile(const char *strcontent,
if (STRNEQ_NULLABLE(fixedcontent ? fixedcontent : strcontent,
filecontent)) {
- virtTestDifferenceFull(stderr,
- filecontent, filename,
- strcontent, NULL);
+ virTestDifferenceFull(stderr,
+ filecontent, filename,
+ strcontent, NULL);
goto failure;
}
diff --git a/tests/testutils.h b/tests/testutils.h
index 350401b..d9f92b5 100644
--- a/tests/testutils.h
+++ b/tests/testutils.h
@@ -59,11 +59,11 @@ void virtTestClearCommandPath(char *cmdset);
int virTestDifference(FILE *stream,
const char *expect,
const char *actual);
-int virtTestDifferenceFull(FILE *stream,
- const char *expect,
- const char *expectName,
- const char *actual,
- const char *actualName);
+int virTestDifferenceFull(FILE *stream,
+ const char *expect,
+ const char *expectName,
+ const char *actual,
+ const char *actualName);
int virtTestDifferenceFullNoRegenerate(FILE *stream,
const char *expect,
const char *expectName,
--
2.5.5