Rename virtTestDifferenceFull to virTestDifferenceFull.

This function doesn't follow our convention of naming functions.

diff --git a/tests/domainsnapshotxml2xmltest.c b/tests/domainsnapshotxml2xmltest.c
index 8195e22e307a2efff368604f41e9da7fc397dea5..650c56532daa463ff444d9c4b13af07b9be3b7ef 100644 (file)
--- 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 a2ebf16b0afe3468c7be023aff2855d27b1a822b..5e3525e4400710c546739a69789af0267991a205 100644 (file)
--- 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 cd8bf8a93ef984c82bfb5d5de90e59c907464812..eb32dd31d221f73b64efbdc105e85aa899c79e3b 100644 (file)
--- 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 68279d0c2ab273d9d5307c2f686631fbbb474fe8..447fb75fd632d6d29bda8f0511d43bf57f06ef88 100644 (file)
--- 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 0de048486a5330aedbbce12b64199bec31a07179..081ed8bf9962cd598d0f0f213e871c12e8de39f5 100644 (file)
--- 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 350401b2431c0e24cbfb225621ed453004529816..d9f92b51153f877188fb3a30ca7fd075de808dc4 100644 (file)
--- 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,