[PATCH 20/36] util: bitmap: Unexport 'virBitmapParseSeparator'
The function isn't used besides tests. Since the separator parsing
capability is trivial we can keep it in place and just unexport it for
now.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/libvirt_private.syms | 1 -
src/util/virbitmap.c | 2 +-
src/util/virbitmap.h | 5 -----
tests/virbitmaptest.c | 2 +-
4 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 7be5b51100..ac0a704750 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1851,7 +1851,6 @@ virBitmapNextClearBit;
virBitmapNextSetBit;
virBitmapOverlaps;
virBitmapParse;
-virBitmapParseSeparator;
virBitmapParseUnlimited;
virBitmapSetAll;
virBitmapSetBit;
diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c
index ee76fec8cd..5f14f1e5e0 100644
--- a/src/util/virbitmap.c
+++ b/src/util/virbitmap.c
@@ -397,7 +397,7 @@ virBitmapFormat(virBitmap *bitmap)
*
* Returns 0 on success, or -1 in case of error.
*/
-int
+static int
virBitmapParseSeparator(const char *str,
char terminator,
virBitmap **bitmap,
diff --git a/src/util/virbitmap.h b/src/util/virbitmap.h
index 026659544e..48074d1ae6 100644
--- a/src/util/virbitmap.h
+++ b/src/util/virbitmap.h
@@ -81,11 +81,6 @@ int virBitmapParse(const char *str,
virBitmap **bitmap,
size_t bitmapSize)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
-int
-virBitmapParseSeparator(const char *str,
- char terminator,
- virBitmap **bitmap,
- size_t bitmapSize);
virBitmap *
virBitmapParseUnlimited(const char *str);
diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c
index 02241c4c20..1794f73f34 100644
--- a/tests/virbitmaptest.c
+++ b/tests/virbitmaptest.c
@@ -497,7 +497,7 @@ test10(const void *opaque G_GNUC_UNUSED)
g_autoptr(virBitmap) b3 = NULL;
g_autoptr(virBitmap) b4 = NULL;
- if (virBitmapParseSeparator("0-3,5-8,11-15f16", 'f', &b1, 20)
< 0 ||
+ if (virBitmapParse("0-3,5-8,11-15", &b1, 20) < 0 ||
virBitmapParse("4,9,10,16-19", &b2, 20) < 0 ||
virBitmapParse("15", &b3, 20) < 0 ||
virBitmapParse("0,^0", &b4, 20) < 0)
--
2.31.1