tests: Rename virtTestCounterNext to virTestCounterNext.

This function doesn't follow our convention of naming functions.

diff --git a/tests/qemucommandutiltest.c b/tests/qemucommandutiltest.c
index 08f12c5e463b13f9fb8e6e3eccd912f072cb5a7e..c02d1db1b4958a682d6f45ae65dac8d38be3ba84 100644 (file)
--- a/tests/qemucommandutiltest.c
+++ b/tests/qemucommandutiltest.c
@@ -86,7 +86,7 @@ mymain(void)
     do {                                                            \
         data1.props = PROPS;                                        \
         data1.expectprops = EXPECT;                                 \
-        if (virTestRun(virtTestCounterNext(),                       \
+        if (virTestRun(virTestCounterNext(),                        \
                        testQemuCommandBuildObjectFromJSON,          \
                        &data1) < 0)                                 \
             ret = -1;                                               \

diff --git a/tests/testutils.c b/tests/testutils.c
index 41ee7e7324ee334cf458651529e1b933ef19793b..1a5515cf320871878e207a9abe00fdb0083e5bb9 100644 (file)
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -1174,7 +1174,7 @@ static char *virtTestCounterPrefixEndOffset;
  * @prefix: name of the test group
  *
  * Resets the counter and sets up the test group name to use with
- * virtTestCounterNext(). This function is not thread safe.
+ * virTestCounterNext(). This function is not thread safe.
  *
  * Note: The buffer for the assembled message is 128 bytes long. Longer test
  * case names (including the number index) will be silently truncated.
@@ -1190,7 +1190,7 @@ virTestCounterReset(const char *prefix)
 
 
 /**
- * virtTestCounterNext:
+ * virTestCounterNext:
  *
  * This function is designed to ease test creation and reordering by adding
  * a way to do automagic test case numbering.
@@ -1203,7 +1203,7 @@ virTestCounterReset(const char *prefix)
  * case names (including the number index) will be silently truncated.
  */
 const char
-*virtTestCounterNext(void)
+*virTestCounterNext(void)
 {
     size_t len = ARRAY_CARDINALITY(virtTestCounterStr);
 

diff --git a/tests/testutils.h b/tests/testutils.h
index 98db36b18d7912ca5981337b8447516340f9c209..352f80ab9a14de3f49c048bb64d85558f9523b2f 100644 (file)
--- a/tests/testutils.h
+++ b/tests/testutils.h
@@ -98,7 +98,7 @@ char *virTestLogContentAndReset(void);
 void virTestQuiesceLibvirtErrors(bool always);
 
 void virTestCounterReset(const char *prefix);
-const char *virtTestCounterNext(void);
+const char *virTestCounterNext(void);
 
 int virtTestMain(int argc,
                  char **argv,

diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c
index eb2385f2d9841269608c633bf681273e70dec756..00369aff10db0c03b383b0d81ee441f13b2e66d0 100644 (file)
--- a/tests/virbitmaptest.c
+++ b/tests/virbitmaptest.c
@@ -645,7 +645,7 @@ test12(const void *opaque ATTRIBUTE_UNUSED)
     testBinaryOpData.a = A;                                                   \
     testBinaryOpData.b = B;                                                   \
     testBinaryOpData.res = RES;                                               \
-    if (virTestRun(virtTestCounterNext(), FUNC, &testBinaryOpData) < 0)       \
+    if (virTestRun(virTestCounterNext(), FUNC, &testBinaryOpData) < 0)        \
         ret = -1;
 
 static int

diff --git a/tests/virfiletest.c b/tests/virfiletest.c
index 27e83fd103c2d2229a29372922cc22333c08b6d3..a6458df5b87f69012963cfeaf3cbea1b91c11b0d 100644 (file)
--- a/tests/virfiletest.c
+++ b/tests/virfiletest.c
@@ -160,7 +160,7 @@ mymain(void)
     do {                                                                       \
         data1.path = PATH;                                                     \
         data1.expect = EXPECT;                                                 \
-        if (virTestRun(virtTestCounterNext(), testFileSanitizePath,            \
+        if (virTestRun(virTestCounterNext(), testFileSanitizePath,             \
                        &data1) < 0)                                            \
             ret = -1;                                                          \
     } while (0)

diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index 3d4a7637c01abbd5fb664edd0e71447d1f4fda0b..580065e04d1cfe4a59257edb90bff6a727a4f4df 100644 (file)
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -693,7 +693,7 @@ mymain(void)
         for (i = 0; i < ARRAY_CARDINALITY(data.files); i++)          \
             if (data.files[i])                                       \
                 data.nfiles++;                                       \
-        if (virTestRun(virtTestCounterNext(),                        \
+        if (virTestRun(virTestCounterNext(),                         \
                        testStorageChain, &data) < 0)                 \
             ret = -1;                                                \
     } while (0)