[libvirt] [PATCH v2 16/19] tests: Rename virtTestCaptureProgramOutput to virTestCaptureProgramOutput.
This function doesn't follow our convention of naming functions.
---
tests/testutils.c | 8 ++++----
tests/testutils.h | 2 +-
tests/virshtest.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/tests/testutils.c b/tests/testutils.c
index 111139a..32a7ee2 100644
--- 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 c79438e..30d7a60 100644
--- 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 f330aa8..2f10224 100644
--- 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)
--
2.5.5