From fecc6ed090eca458c112b943fb52f1a5f5bc1a54 Mon Sep 17 00:00:00 2001
From: John Ferlan <jferlan@redhat.com>
Date: Tue, 21 Mar 2017 13:51:11 -0400
Subject: [PATCH] util: Remove NONNULL(1) for virBitmapParseUnlimited

The code checks and handles a NULL 'str', so just remove the NONNULL.

Update the error message to add the NULLSTR() around 'str' also.

Signed-off-by: John Ferlan <jferlan@redhat.com>
---
 src/util/virbitmap.c | 2 +-
 src/util/virbitmap.h | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c
index d263d73cad..eac63d9974 100644
--- a/src/util/virbitmap.c
+++ b/src/util/virbitmap.c
@@ -647,7 +647,7 @@ virBitmapParseUnlimited(const char *str)
 
  error:
     virReportError(VIR_ERR_INVALID_ARG,
-                   _("Failed to parse bitmap '%s'"), str);
+                   _("Failed to parse bitmap '%s'"), NULLSTR(str));
     virBitmapFree(bitmap);
     return NULL;
 }
diff --git a/src/util/virbitmap.h b/src/util/virbitmap.h
index 3ba40aed65..36282af1cd 100644
--- a/src/util/virbitmap.h
+++ b/src/util/virbitmap.h
@@ -95,8 +95,7 @@ virBitmapParseSeparator(const char *str,
                         virBitmapPtr *bitmap,
                         size_t bitmapSize);
 virBitmapPtr
-virBitmapParseUnlimited(const char *str)
-    ATTRIBUTE_NONNULL(1);
+virBitmapParseUnlimited(const char *str);
 
 virBitmapPtr virBitmapNewCopy(virBitmapPtr src) ATTRIBUTE_NONNULL(1);
 
-- 
GitLab