External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 19:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

virBitmapUnion: Remove return value

Browse Source 
The function can't fail at this point. Remove the return value.

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 15:55:46 +01:00
parent ab88ace58d
commit 58fec2cef4
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/util/virbitmap.c
View File

@ -1164,10 +1164,8 @@ virBitmapIntersect(virBitmap *a,
* @b: other bitmap * @b: other bitmap
* *
* Performs union of two bitmaps: a = union(a, b) * Performs union of two bitmaps: a = union(a, b)
*
* Returns 0 on success, <0 on failure.
*/ */
int void
virBitmapUnion(virBitmap *a, virBitmapUnion(virBitmap *a,
const virBitmap *b) const virBitmap *b)
{ {
@ -1178,8 +1176,6 @@ virBitmapUnion(virBitmap *a,
for (i = 0; i < b->map_len; i++) for (i = 0; i < b->map_len; i++)
a->map[i] |= b->map[i]; a->map[i] |= b->map[i];
return 0;
} }

4
src/util/virbitmap.h
View File

@ -133,8 +133,8 @@ bool virBitmapOverlaps(virBitmap *b1,
void virBitmapIntersect(virBitmap *a, virBitmap *b) void virBitmapIntersect(virBitmap *a, virBitmap *b)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
int virBitmapUnion(virBitmap *a, void virBitmapUnion(virBitmap *a,
const virBitmap *b) const virBitmap *b)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
void virBitmapSubtract(virBitmap *a, virBitmap *b) void virBitmapSubtract(virBitmap *a, virBitmap *b)

3
src/util/virnuma.c
View File

@ -333,8 +333,7 @@ virNumaNodesetToCPUset(virBitmap *nodeset,
return -1; return -1;
} }
if (virBitmapUnion(allNodesCPUs, nodeCPUs) < 0) virBitmapUnion(allNodesCPUs, nodeCPUs);
return -1;
} }
*cpuset = g_steal_pointer(&allNodesCPUs); *cpuset = g_steal_pointer(&allNodesCPUs);

3
tests/virbitmaptest.c
View File

@ -665,8 +665,7 @@ test15(const void *opaque)
return -1; return -1;
} }
if (virBitmapUnion(amap, bmap) < 0) virBitmapUnion(amap, bmap);
return -1;
if (!virBitmapEqual(amap, resmap)) { if (!virBitmapEqual(amap, resmap)) {
fprintf(stderr, fprintf(stderr,