[PATCH 08/21] virBitmapFormat: Clarify returned values

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



NULL can't be returned; don't mention it in the docs.

Avoid extra cofusing variable when returning copy of empty string.

Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
 src/util/virbitmap.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c
index 138c1ac5af..e42f5b872c 100644
--- a/src/util/virbitmap.c
+++ b/src/util/virbitmap.c
@@ -327,8 +327,8 @@ virBitmapToString(virBitmap *bitmap)
  *
  * If bitmap is NULL or it has no bits set, an empty string is returned.
  *
- * Returns the string on success or NULL otherwise. Caller should call
- * VIR_FREE to free the string.
+ * Returns the formatted string. Caller is responsible for freeing the returned
+ * string.
  */
 char *
 virBitmapFormat(virBitmap *bitmap)
@@ -337,11 +337,8 @@ virBitmapFormat(virBitmap *bitmap)
     bool first = true;
     int start, cur, prev;

-    if (!bitmap || (cur = virBitmapNextSetBit(bitmap, -1)) < 0) {
-        char *ret;
-        ret = g_strdup("");
-        return ret;
-    }
+    if (!bitmap || (cur = virBitmapNextSetBit(bitmap, -1)) < 0)
+        return g_strdup("");

     start = prev = cur;
     while (prev >= 0) {
-- 
2.48.1




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux