[libvirt] [PATCH v2 19/19] tests: Rename virtTestMain to virTestMain.

Tomáš Ryšavý tom.rysavy.0 at gmail.com
Thu May 26 15:02:08 UTC 2016


This function doesn't follow our convention of naming functions.
---
 tests/testutils.c |  8 ++++----
 tests/testutils.h | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/testutils.c b/tests/testutils.c
index 5cff5d8..bc17ea7 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -841,10 +841,10 @@ virTestSetEnvPath(void)
 
 #define TEST_MOCK (abs_builddir "/.libs/virtestmock.so")
 
-int virtTestMain(int argc,
-                 char **argv,
-                 int (*func)(void),
-                 ...)
+int virTestMain(int argc,
+                char **argv,
+                int (*func)(void),
+                ...)
 {
     const char *lib;
     va_list ap;
diff --git a/tests/testutils.h b/tests/testutils.h
index 95af06a..366beae 100644
--- a/tests/testutils.h
+++ b/tests/testutils.h
@@ -100,15 +100,15 @@ void virTestQuiesceLibvirtErrors(bool always);
 void virTestCounterReset(const char *prefix);
 const char *virTestCounterNext(void);
 
-int virtTestMain(int argc,
-                 char **argv,
-                 int (*func)(void),
-                 ...);
+int virTestMain(int argc,
+                char **argv,
+                int (*func)(void),
+                ...);
 
 /* Setup, then call func() */
 # define VIRT_TEST_MAIN(func)                           \
     int main(int argc, char **argv) {                   \
-        return virtTestMain(argc, argv, func, NULL);    \
+        return virTestMain(argc, argv, func, NULL);     \
     }
 
 # define VIRT_TEST_PRELOAD(lib)                                         \
@@ -133,7 +133,7 @@ int virtTestMain(int argc,
 
 # define VIRT_TEST_MAIN_PRELOAD(func, ...)                              \
     int main(int argc, char **argv) {                                   \
-        return virtTestMain(argc, argv, func, __VA_ARGS__, NULL);       \
+        return virTestMain(argc, argv, func, __VA_ARGS__, NULL);        \
     }
 
 virCapsPtr virTestGenericCapsInit(void);
-- 
2.5.5




More information about the libvir-list mailing list