External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-28 03:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

virBitmapParseSeparator: Remove separator parsing capability

Browse Source 
Since the feature is not needed remove it and remove the function to
virBitmapParseInternal.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-12-06 16:16:18 +01:00
parent f3af9e36fb
commit d8579b07c8
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/util/virbitmap.c
View File

@ -364,9 +364,8 @@ virBitmapFormat(virBitmap *bitmap)
/** /**
* virBitmapParseSeparator: * virBitmapParseInternal:
* @str: points to a string representing a human-readable bitmap * @str: points to a string representing a human-readable bitmap
* @terminator: character separating the bitmap to parse
* @bitmap: a bitmap created from @str * @bitmap: a bitmap created from @str
* @bitmapSize: the upper limit of num of bits in created bitmap * @bitmapSize: the upper limit of num of bits in created bitmap
* *
@ -377,19 +376,12 @@ virBitmapFormat(virBitmap *bitmap)
* to set, and ^N, which means to unset the bit, and N-M for ranges of bits * to set, and ^N, which means to unset the bit, and N-M for ranges of bits
* to set. * to set.
* *
* To allow parsing of bitmaps within larger strings it is possible to set
* a termination character in the argument @terminator. When the character
* in @terminator is encountered in @str, the parsing of the bitmap stops.
* Pass 0 as @terminator if it is not needed. Whitespace characters may not
* be used as terminators.
*
* Returns 0 on success, or -1 in case of error. * Returns 0 on success, or -1 in case of error.
*/ */
static int static int
virBitmapParseSeparator(const char *str, virBitmapParseInternal(const char *str,
char terminator, virBitmap **bitmap,
virBitmap **bitmap, size_t bitmapSize)
size_t bitmapSize)
{ {
bool neg = false; bool neg = false;
const char *cur = str; const char *cur = str;
@ -407,7 +399,7 @@ virBitmapParseSeparator(const char *str,
if (*cur == '\0') if (*cur == '\0')
goto error; goto error;
while (*cur != 0 && *cur != terminator) { while (*cur != 0) {
/* /*
* 3 constructs are allowed: * 3 constructs are allowed:
* - N : a single CPU number * - N : a single CPU number
@ -431,7 +423,7 @@ virBitmapParseSeparator(const char *str,
virSkipSpaces(&cur); virSkipSpaces(&cur);
if (*cur == ',' || *cur == 0 || *cur == terminator) { if (*cur == ',' || *cur == 0) {
if (neg) { if (neg) {
if (virBitmapClearBit(*bitmap, start) < 0) if (virBitmapClearBit(*bitmap, start) < 0)
goto error; goto error;
@ -465,7 +457,7 @@ virBitmapParseSeparator(const char *str,
cur++; cur++;
virSkipSpaces(&cur); virSkipSpaces(&cur);
neg = false; neg = false;
} else if (*cur == 0 || *cur == terminator) { } else if (*cur == 0) {
break; break;
} else { } else {
goto error; goto error;
@ -503,7 +495,7 @@ virBitmapParse(const char *str,
virBitmap **bitmap, virBitmap **bitmap,
size_t bitmapSize) size_t bitmapSize)
{ {
return virBitmapParseSeparator(str, '\0', bitmap, bitmapSize); return virBitmapParseInternal(str, bitmap, bitmapSize);
} }