util: Rename virBitmapString to virBitmapToString

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@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 99452a263410bbc1eeda1bad003584e52d18523f..36f09a24839724d73c2ee5ce6742ea76102a95b5 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1375,9 +1375,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 bd16a0de0c259bc9095f36278f2003f85d3135c4..e318eac557557aa2ab1d4661c67eeb8f8fd681e1 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1510,7 +1510,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);
@@ -2377,7 +2377,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 f08384ff1c63ffc5f49ac177e9968e60b3d16ae2..e7d04e8c8b29476c84abd2ecf984c33c6f9341b7 100644 (file)
--- 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"
  *
@@ -319,8 +319,8 @@ int virBitmapGetBit(virBitmapPtr bitmap, size_t b, bool *result)
  * Returns pointer to the string or NULL on error.
  */
 char *
-virBitmapString(virBitmapPtr bitmap,
-                bool prefix)
+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 dc8fb71a07b8d2455fedc6c08c02b16a30e5be0b..99eb779d7188dd58938aa231a8f8fdf5b4dbd0ec 100644 (file)
--- 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);