tests: Rename virtTestCaptureProgramOutput to virTestCaptureProgramOutput.

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

diff --git a/tests/testutils.c b/tests/testutils.c
index 4d4d1ab442c15812104c1bfecfaea1bb446533ff..41ee7e7324ee334cf458651529e1b933ef19793b 100644 (file)
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -396,7 +396,7 @@ void virTestCaptureProgramExecChild(const char *const argv[],
 }
 
 int
-virtTestCaptureProgramOutput(const char *const argv[], char **buf, int maxlen)
+virTestCaptureProgramOutput(const char *const argv[], char **buf, int maxlen)
 {
     int pipefd[2];
     int len;
@@ -428,9 +428,9 @@ virtTestCaptureProgramOutput(const char *const argv[], char **buf, int maxlen)
 }
 #else /* !WIN32 */
 int
-virtTestCaptureProgramOutput(const char *const argv[] ATTRIBUTE_UNUSED,
-                             char **buf ATTRIBUTE_UNUSED,
-                             int maxlen ATTRIBUTE_UNUSED)
+virTestCaptureProgramOutput(const char *const argv[] ATTRIBUTE_UNUSED,
+                            char **buf ATTRIBUTE_UNUSED,
+                            int maxlen ATTRIBUTE_UNUSED)
 {
     return -1;
 }

diff --git a/tests/testutils.h b/tests/testutils.h
index 82e22cfe3e91cc2f458a2f00b7c2f638c1668bdf..98db36b18d7912ca5981337b8447516340f9c209 100644 (file)
--- a/tests/testutils.h
+++ b/tests/testutils.h
@@ -52,7 +52,7 @@ int virTestRun(const char *title,
                int (*body)(const void *data),
                const void *data);
 int virTestLoadFile(const char *file, char **buf);
-int virtTestCaptureProgramOutput(const char *const argv[], char **buf, int maxlen);
+int virTestCaptureProgramOutput(const char *const argv[], char **buf, int maxlen);
 
 void virTestClearCommandPath(char *cmdset);
 

diff --git a/tests/virshtest.c b/tests/virshtest.c
index f330aa8afa354f746c57a08281ee0a09012b005d..2f1022416a8a0882ab1e7b6cd02ffbae72d709c9 100644 (file)
--- a/tests/virshtest.c
+++ b/tests/virshtest.c
@@ -65,7 +65,7 @@ testCompareOutputLit(const char *expectData,
     int result = -1;
     char *actualData = NULL;
 
-    if (virtTestCaptureProgramOutput(argv, &actualData, 4096) < 0)
+    if (virTestCaptureProgramOutput(argv, &actualData, 4096) < 0)
         goto cleanup;
 
     if (filter && testFilterLine(actualData, filter) < 0)