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

This function doesn't follow our convention of naming functions. --- tests/testutils.c | 2 +- tests/testutils.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/testutils.c b/tests/testutils.c index 61e7a22..b96fed6 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -841,7 +841,7 @@ virTestSetEnvPath(void) #define TEST_MOCK (abs_builddir "/.libs/virtestmock.so") -int virtTestMain(int argc, +int virTestMain(int argc, char **argv, int (*func)(void), ...) diff --git a/tests/testutils.h b/tests/testutils.h index 7d9edcc..3ef270d 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -100,7 +100,7 @@ void virTestQuiesceLibvirtErrors(bool always); void virTestCounterReset(const char *prefix); const char *virTestCounterNext(void); -int virtTestMain(int argc, +int virTestMain(int argc, char **argv, int (*func)(void), ...); @@ -108,7 +108,7 @@ int virtTestMain(int argc, /* 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