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>
This commit is contained in:
Martin Kletzander 2017-08-22 08:30:43 +02:00
parent d127aced0a
commit 68d7cc649c
4 changed files with 7 additions and 7 deletions

View File

@ -1375,9 +1375,9 @@ virBitmapSetAll;
virBitmapSetBit; virBitmapSetBit;
virBitmapSetBitExpand; virBitmapSetBitExpand;
virBitmapSize; virBitmapSize;
virBitmapString;
virBitmapToData; virBitmapToData;
virBitmapToDataBuf; virBitmapToDataBuf;
virBitmapToString;
# util/virbuffer.h # util/virbuffer.h

View File

@ -1510,7 +1510,7 @@ int virQEMUCapsParseHelpStr(const char *qemu,
qemuCaps, check_yajl) < 0) qemuCaps, check_yajl) < 0)
goto cleanup; goto cleanup;
strflags = virBitmapString(qemuCaps->flags, true); strflags = virBitmapToString(qemuCaps->flags, true);
VIR_DEBUG("Version %u.%u.%u, cooked version %u, flags %s", VIR_DEBUG("Version %u.%u.%u, cooked version %u, flags %s",
major, minor, micro, *version, NULLSTR(strflags)); major, minor, micro, *version, NULLSTR(strflags));
VIR_FREE(strflags); VIR_FREE(strflags);
@ -2377,7 +2377,7 @@ virQEMUCapsClear(virQEMUCapsPtr qemuCaps,
char *virQEMUCapsFlagsString(virQEMUCapsPtr qemuCaps) char *virQEMUCapsFlagsString(virQEMUCapsPtr qemuCaps)
{ {
return virBitmapString(qemuCaps->flags, true); return virBitmapToString(qemuCaps->flags, true);
} }

View File

@ -310,7 +310,7 @@ int virBitmapGetBit(virBitmapPtr bitmap, size_t b, bool *result)
} }
/** /**
* virBitmapString: * virBitmapToString:
* @bitmap: Pointer to bitmap * @bitmap: Pointer to bitmap
* @prefix: Whether to prepend "0x" * @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. * Returns pointer to the string or NULL on error.
*/ */
char * char *
virBitmapString(virBitmapPtr bitmap, virBitmapToString(virBitmapPtr bitmap,
bool prefix) bool prefix)
{ {
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
size_t sz; size_t sz;

View File

@ -80,7 +80,7 @@ bool virBitmapIsBitSet(virBitmapPtr bitmap, size_t b)
int virBitmapGetBit(virBitmapPtr bitmap, size_t b, bool *result) int virBitmapGetBit(virBitmapPtr bitmap, size_t b, bool *result)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; 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; ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK;
char *virBitmapFormat(virBitmapPtr bitmap); char *virBitmapFormat(virBitmapPtr bitmap);