[libvirt] [PATCH] events: Remove ATTRIBUTE_NONNULL for virObjectEventStateQueue[Remote]

John Ferlan jferlan at redhat.com
Fri Jun 15 19:49:51 UTC 2018


Commit aad3a0b5f altered virObjectEventStateQueueRemote to move
the "if (!event) return" call added in the previous commit 031eb8f6
to virObjectEventStateQueue. Neither commit altered the function
prototype which used ATTRIBUTE_NONNULL(2).

This caused Coverity build problems. Since @event is now checked,
just remove the ATTRIBUTE_NONNULL check from both prototypes.

Signed-off-by: John Ferlan <jferlan at redhat.com>
---
 src/conf/object_event.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

 Although a Coverity build breaker, that doesn't affect everyone so
 I'll wait for R-By or ACK for push.


diff --git a/src/conf/object_event.h b/src/conf/object_event.h
index 133f7ed914..70e9579e81 100644
--- a/src/conf/object_event.h
+++ b/src/conf/object_event.h
@@ -62,13 +62,13 @@ typedef void (*virConnectObjectEventGenericCallback)(virConnectPtr conn,
 void
 virObjectEventStateQueue(virObjectEventStatePtr state,
                          virObjectEventPtr event)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
+    ATTRIBUTE_NONNULL(1);
 
 void
 virObjectEventStateQueueRemote(virObjectEventStatePtr state,
                                virObjectEventPtr event,
                                int remoteID)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
+    ATTRIBUTE_NONNULL(1);
 
 int
 virObjectEventStateDeregisterID(virConnectPtr conn,
-- 
2.14.4




More information about the libvir-list mailing list