From 1a41ed5af5e1704dd9b0bdca40df5c9cacbdabfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Ry=C5=A1av=C3=BD?= Date: Thu, 26 May 2016 17:02:08 +0200 Subject: [PATCH] tests: Rename virtTestMain to virTestMain. 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 a281fbb8d8..e2dd2fec39 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 352f80ab9a..e3881e895f 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);