virBitmapUnion: Remove return value

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>

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

diff --git a/src/util/virbitmap.h b/src/util/virbitmap.h
index 48074d1ae61646c92ccd0df29865f412e63434fa..23242b44ff5262b51f4abfbabebf0717d8ac1fb9 100644 (file)
--- a/src/util/virbitmap.h
+++ b/src/util/virbitmap.h
@@ -133,8 +133,8 @@ bool virBitmapOverlaps(virBitmap *b1,
 void virBitmapIntersect(virBitmap *a, virBitmap *b)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
 
-int virBitmapUnion(virBitmap *a,
-                   const virBitmap *b)
+void virBitmapUnion(virBitmap *a,
+                    const virBitmap *b)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
 
 void virBitmapSubtract(virBitmap *a, virBitmap *b)

diff --git a/src/util/virnuma.c b/src/util/virnuma.c
index 31f65d89022035ad59662727d4da31f2c600c51a..7c892d6267241333c294586741322002c1f5bbe7 100644 (file)
--- a/src/util/virnuma.c
+++ b/src/util/virnuma.c
@@ -333,8 +333,7 @@ virNumaNodesetToCPUset(virBitmap *nodeset,
             return -1;
         }
 
-        if (virBitmapUnion(allNodesCPUs, nodeCPUs) < 0)
-            return -1;
+        virBitmapUnion(allNodesCPUs, nodeCPUs);
     }
 
     *cpuset = g_steal_pointer(&allNodesCPUs);

diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c
index 1794f73f347d5a02bc6f961745dc0f855c9568c9..4c525679f6aa3c2a0c85107197ad241cfe4bb7a3 100644 (file)
--- a/tests/virbitmaptest.c
+++ b/tests/virbitmaptest.c
@@ -665,8 +665,7 @@ test15(const void *opaque)
         return -1;
     }
 
-    if (virBitmapUnion(amap, bmap) < 0)
-        return -1;
+    virBitmapUnion(amap, bmap);
 
     if (!virBitmapEqual(amap, resmap)) {
         fprintf(stderr,