[PATCH 04/21] util: Rename virBitmapString to virBitmapToString

[Martin Kletzander <mkletzan@xxxxxxxxxx>]

This follows the virBitmapToData() function and, similarly to
virBitmapNewData(), we'll be able to have virBitmapNewString() later
on without name confusion.

Signed-off-by: Martin Kletzander <mkletzan@xxxxxxxxxx>
---
 src/libvirt_private.syms     | 2 +-
 src/qemu/qemu_capabilities.c | 4 ++--
 src/util/virbitmap.c         | 4 ++--
 src/util/virbitmap.h         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index d4bae6150bb8..c11dc9ab5672 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1369,9 +1369,9 @@ virBitmapSetAll;
 virBitmapSetBit;
 virBitmapSetBitExpand;
 virBitmapSize;
-virBitmapString;
 virBitmapToData;
 virBitmapToDataBuf;
+virBitmapToString;
 
 
 # util/virbuffer.h
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index c87feefb3be3..60ca8ee9ef84 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1509,7 +1509,7 @@ int virQEMUCapsParseHelpStr(const char *qemu,
                                    qemuCaps, check_yajl) < 0)
         goto cleanup;
 
-    strflags = virBitmapString(qemuCaps->flags, true);
+    strflags = virBitmapToString(qemuCaps->flags, true);
     VIR_DEBUG("Version %u.%u.%u, cooked version %u, flags %s",
               major, minor, micro, *version, NULLSTR(strflags));
     VIR_FREE(strflags);
@@ -2376,7 +2376,7 @@ virQEMUCapsClear(virQEMUCapsPtr qemuCaps,
 
 char *virQEMUCapsFlagsString(virQEMUCapsPtr qemuCaps)
 {
-    return virBitmapString(qemuCaps->flags, true);
+    return virBitmapToString(qemuCaps->flags, true);
 }
 
 
diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c
index cb6600074781..58ef1a2e299b 100644
--- a/src/util/virbitmap.c
+++ b/src/util/virbitmap.c
@@ -310,7 +310,7 @@ int virBitmapGetBit(virBitmapPtr bitmap, size_t b, bool *result)
 }
 
 /**
- * virBitmapString:
+ * virBitmapToString:
  * @bitmap: Pointer to bitmap
  * @prefix: Whether to prepend "0x"
  *
@@ -318,7 +318,7 @@ int virBitmapGetBit(virBitmapPtr bitmap, size_t b, bool *result)
  *
  * Returns pointer to the string or NULL on error.
  */
-char *virBitmapString(virBitmapPtr bitmap, bool prefix)
+char *virBitmapToString(virBitmapPtr bitmap, bool prefix)
 {
     virBuffer buf = VIR_BUFFER_INITIALIZER;
     size_t sz;
diff --git a/src/util/virbitmap.h b/src/util/virbitmap.h
index dc8fb71a07b8..99eb779d7188 100644
--- a/src/util/virbitmap.h
+++ b/src/util/virbitmap.h
@@ -80,7 +80,7 @@ bool virBitmapIsBitSet(virBitmapPtr bitmap, size_t b)
 int virBitmapGetBit(virBitmapPtr bitmap, size_t b, bool *result)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK;
 
-char *virBitmapString(virBitmapPtr bitmap, bool prefix)
+char *virBitmapToString(virBitmapPtr bitmap, bool prefix)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK;
 
 char *virBitmapFormat(virBitmapPtr bitmap);
-- 
2.15.0

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list