From: John Ferlan <jferlan@redhat.com>
Date: Sat, 14 Dec 2019 15:37:57 +0000 (-0500)
Subject: conf: Fix ATTRIBUTE_NONNULL usages
X-Git-Tag: v6.0.0-rc1~185
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=010571240dea4b850cc363b0ce5689caa50f84db;p=thirdparty%2Flibvirt.git

conf: Fix ATTRIBUTE_NONNULL usages

Recent changes removed the virCapsPtr, but didn't adjust/remove the
corresponding ATTRIBUTE_NONNULL resulting in a build failure to build
in my Coverity environment.

Signed-off-by: John Ferlan <jferlan@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 11fafe46b3..e012975fca 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3089,27 +3089,24 @@ unsigned int virDomainDefFormatConvertXMLFlags(unsigned int flags);
 char *virDomainDefFormat(virDomainDefPtr def,
                          virDomainXMLOptionPtr xmlopt,
                          unsigned int flags)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
-    ATTRIBUTE_NONNULL(3);
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
 char *virDomainObjFormat(virDomainObjPtr obj,
                          virDomainXMLOptionPtr xmlopt,
                          unsigned int flags)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
-    ATTRIBUTE_NONNULL(3);
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
 int virDomainDefFormatInternal(virDomainDefPtr def,
                                virDomainXMLOptionPtr xmlopt,
                                virBufferPtr buf,
                                unsigned int flags)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
-    ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4);
+    ATTRIBUTE_NONNULL(3);
 int virDomainDefFormatInternalSetRootName(virDomainDefPtr def,
                                           virDomainXMLOptionPtr xmlopt,
                                           virBufferPtr buf,
                                           const char *rootname,
                                           unsigned int flags)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
-    ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4)
-    ATTRIBUTE_NONNULL(5);
+    ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4);
 
 int virDomainDiskSourceFormat(virBufferPtr buf,
                               virStorageSourcePtr src,
@@ -3286,14 +3283,14 @@ int virDomainDefSave(virDomainDefPtr def,
                      const char *configDir)
     G_GNUC_WARN_UNUSED_RESULT
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
-    ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4);
+    ATTRIBUTE_NONNULL(3);
 
 int virDomainObjSave(virDomainObjPtr obj,
                      virDomainXMLOptionPtr xmlopt,
                      const char *statusDir)
     G_GNUC_WARN_UNUSED_RESULT
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
-    ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4);
+    ATTRIBUTE_NONNULL(3);
 
 typedef void (*virDomainLoadConfigNotify)(virDomainObjPtr dom,
                                           int newDomain,