[libvirt] [PATCH 09/19] tests: Rename virtTestLogContentAndReset to virTestLogContentAndReset.
This function doesn't follow our convention of naming functions.
---
tests/cputest.c | 4 ++--
tests/qemuargv2xmltest.c | 2 +-
tests/qemuxml2argvtest.c | 4 ++--
tests/testutils.c | 2 +-
tests/testutils.h | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/cputest.c b/tests/cputest.c
index c0e26be..010846c 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -476,13 +476,13 @@ cpuTestRun(const char *name, const struct data *data)
if (virAsprintf(&label, "CPU %s(%s): %s", apis[data->api],
data->arch, name) < 0)
return -1;
- tmp = virtTestLogContentAndReset();
+ tmp = virTestLogContentAndReset();
VIR_FREE(tmp);
if (virTestRun(label, cpuTest[data->api], data) < 0) {
if (virTestGetDebug()) {
char *log;
- if ((log = virtTestLogContentAndReset()) &&
+ if ((log = virTestLogContentAndReset()) &&
strlen(log) > 0)
VIR_TEST_DEBUG("\n%s\n", log);
VIR_FREE(log);
diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c
index c614e9f..1d95eda 100644
--- a/tests/qemuargv2xmltest.c
+++ b/tests/qemuargv2xmltest.c
@@ -70,7 +70,7 @@ static int testCompareXMLToArgvFiles(const char *xmlfile,
goto fail;
if (!virTestOOMActive()) {
- if ((log = virtTestLogContentAndReset()) == NULL)
+ if ((log = virTestLogContentAndReset()) == NULL)
goto fail;
if (flags & FLAG_EXPECT_WARNING) {
if (*log) {
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index e4edb83..1ee664b 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -310,7 +310,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
virQEMUCapsFilterByMachineType(extraFlags, vm->def->os.machine);
- log = virtTestLogContentAndReset();
+ log = virTestLogContentAndReset();
VIR_FREE(log);
virResetLastError();
@@ -353,7 +353,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
}
if (!virTestOOMActive()) {
if (flags & FLAG_EXPECT_FAILURE) {
- if ((log = virtTestLogContentAndReset()))
+ if ((log = virTestLogContentAndReset()))
VIR_TEST_DEBUG("Got expected error: \n%s", log);
}
virResetLastError();
diff --git a/tests/testutils.c b/tests/testutils.c
index cb4382a..40ac8ef 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -768,7 +768,7 @@ virTestLogClose(void *data)
/* Return a malloc'd string (possibly with strlen of 0) of all data
* logged since the last call to this function, or NULL on failure. */
char *
-virtTestLogContentAndReset(void)
+virTestLogContentAndReset(void)
{
char *ret;
diff --git a/tests/testutils.h b/tests/testutils.h
index 2e3fada..265a0a9 100644
--- a/tests/testutils.h
+++ b/tests/testutils.h
@@ -93,7 +93,7 @@ unsigned int virTestGetRegenerate(void);
fprintf(stderr, __VA_ARGS__); \
} while (0)
-char *virtTestLogContentAndReset(void);
+char *virTestLogContentAndReset(void);
void virtTestQuiesceLibvirtErrors(bool always);
--
2.5.5