From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 25 Mar 2014 07:17:27 +0000 (+0100)
Subject: util: Sanitize ATTRIBUTE_NONNULL use in viriscsi.h
X-Git-Tag: v1.2.3-rc1~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=562112f4f9caa922744ce342538747cdff7b4910;p=thirdparty%2Flibvirt.git

util: Sanitize ATTRIBUTE_NONNULL use in viriscsi.h

Some of the function attributes marked as nonnull actually explicitly
handle the arguments for NULL. All changed functions handle missing
"initiatoriqn" argument well and virISCSIScanTargets also handles well
if the return pointers are missing. Remove some of the liberaly used
ATTRIBUTE_NONNULLs as coverity and possibly other compilers that honor
the attribute fail to compile the code.

Flaw introduced in commit 5e1d5dde
---

diff --git a/src/util/viriscsi.h b/src/util/viriscsi.h
index b2dd3f1d1b..f4093f7165 100644
--- a/src/util/viriscsi.h
+++ b/src/util/viriscsi.h
@@ -33,14 +33,14 @@ int
 virISCSIConnectionLogin(const char *portal,
                         const char *initiatoriqn,
                         const char *target)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3)
     ATTRIBUTE_RETURN_CHECK;
 
 int
 virISCSIConnectionLogout(const char *portal,
                          const char *initiatoriqn,
                          const char *target)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3)
     ATTRIBUTE_RETURN_CHECK;
 
 int
@@ -52,8 +52,7 @@ virISCSIScanTargets(const char *portal,
                     const char *initiatoriqn,
                     size_t *ntargetsret,
                     char ***targetsret)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
-    ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK;
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK;
 
 int
 virISCSINodeUpdate(const char *portal,