virbitmap: Allow NULL bitmap in functions returning index of a set/clear bit

virBitmapNextSetBit/virBitmapLastSetBit/virBitmapNextClearBit can be
used for iteration of a bitmap. Allow NULL bitmap so that iteration of a
bitmap can be simplified in certain cases.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c
index bdcbd0aece5f214e491625d947861be561b108d9..48ffed0a0fec8af5ff9c26ec8b0fcc05544e8577 100644 (file)
--- a/src/util/virbitmap.c
+++ b/src/util/virbitmap.c
@@ -824,6 +824,9 @@ virBitmapNextSetBit(virBitmap *bitmap,
     size_t nb;
     unsigned long bits;
 
+    if (!bitmap)
+        return -1;
+
     if (pos < 0)
         pos = -1;
 
@@ -863,6 +866,9 @@ virBitmapLastSetBit(virBitmap *bitmap)
     ssize_t sz;
     unsigned long bits;
 
+    if (!bitmap)
+        return -1;
+
     /* If bitmap is empty then there is no set bit */
     if (bitmap->map_len == 0)
         return -1;
@@ -916,6 +922,9 @@ virBitmapNextClearBit(virBitmap *bitmap,
     size_t nb;
     unsigned long bits;
 
+    if (!bitmap)
+        return -1;
+
     if (pos < 0)
         pos = -1;
 

diff --git a/src/util/virbitmap.h b/src/util/virbitmap.h
index dbd88c9bb529ec77137ac88351d9f1c175f6e3de..a9cf309884b61b9f4a622547c48ef63bf65d5cfd 100644 (file)
--- a/src/util/virbitmap.h
+++ b/src/util/virbitmap.h
@@ -111,14 +111,11 @@ bool virBitmapIsAllSet(virBitmap *bitmap)
 bool virBitmapIsAllClear(virBitmap *bitmap)
     ATTRIBUTE_NONNULL(1);
 
-ssize_t virBitmapNextSetBit(virBitmap *bitmap, ssize_t pos)
-    ATTRIBUTE_NONNULL(1);
+ssize_t virBitmapNextSetBit(virBitmap *bitmap, ssize_t pos);
 
-ssize_t virBitmapLastSetBit(virBitmap *bitmap)
-    ATTRIBUTE_NONNULL(1);
+ssize_t virBitmapLastSetBit(virBitmap *bitmap);
 
-ssize_t virBitmapNextClearBit(virBitmap *bitmap, ssize_t pos)
-    ATTRIBUTE_NONNULL(1);
+ssize_t virBitmapNextClearBit(virBitmap *bitmap, ssize_t pos);
 
 size_t virBitmapCountBits(virBitmap *bitmap)
     ATTRIBUTE_NONNULL(1);