提交 01057124 编写于 作者: J John Ferlan

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: NJohn Ferlan <jferlan@redhat.com>
Reviewed-by: NMichal Privoznik <mprivozn@redhat.com>
上级 50e3f8f8
...@@ -3089,27 +3089,24 @@ unsigned int virDomainDefFormatConvertXMLFlags(unsigned int flags); ...@@ -3089,27 +3089,24 @@ unsigned int virDomainDefFormatConvertXMLFlags(unsigned int flags);
char *virDomainDefFormat(virDomainDefPtr def, char *virDomainDefFormat(virDomainDefPtr def,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
unsigned int flags) unsigned int flags)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
ATTRIBUTE_NONNULL(3);
char *virDomainObjFormat(virDomainObjPtr obj, char *virDomainObjFormat(virDomainObjPtr obj,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
unsigned int flags) unsigned int flags)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
ATTRIBUTE_NONNULL(3);
int virDomainDefFormatInternal(virDomainDefPtr def, int virDomainDefFormatInternal(virDomainDefPtr def,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
virBufferPtr buf, virBufferPtr buf,
unsigned int flags) unsigned int flags)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); ATTRIBUTE_NONNULL(3);
int virDomainDefFormatInternalSetRootName(virDomainDefPtr def, int virDomainDefFormatInternalSetRootName(virDomainDefPtr def,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
virBufferPtr buf, virBufferPtr buf,
const char *rootname, const char *rootname,
unsigned int flags) unsigned int flags)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4);
ATTRIBUTE_NONNULL(5);
int virDomainDiskSourceFormat(virBufferPtr buf, int virDomainDiskSourceFormat(virBufferPtr buf,
virStorageSourcePtr src, virStorageSourcePtr src,
...@@ -3286,14 +3283,14 @@ int virDomainDefSave(virDomainDefPtr def, ...@@ -3286,14 +3283,14 @@ int virDomainDefSave(virDomainDefPtr def,
const char *configDir) const char *configDir)
G_GNUC_WARN_UNUSED_RESULT G_GNUC_WARN_UNUSED_RESULT
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); ATTRIBUTE_NONNULL(3);
int virDomainObjSave(virDomainObjPtr obj, int virDomainObjSave(virDomainObjPtr obj,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
const char *statusDir) const char *statusDir)
G_GNUC_WARN_UNUSED_RESULT G_GNUC_WARN_UNUSED_RESULT
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); ATTRIBUTE_NONNULL(3);
typedef void (*virDomainLoadConfigNotify)(virDomainObjPtr dom, typedef void (*virDomainLoadConfigNotify)(virDomainObjPtr dom,
int newDomain, int newDomain,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册