[libvirt] [PATCH 3/3] rpc: fix non-NULL annotations when GNUTLS is disabled

Daniel P. Berrangé berrange at redhat.com
Thu Feb 1 15:35:52 UTC 2018


The position of various parameters changes depending on the WITH_GNUTLS
macro.

Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
---
 src/rpc/virnetserverclient.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/rpc/virnetserverclient.h b/src/rpc/virnetserverclient.h
index 4a0d3cc25e..1a939ad4e1 100644
--- a/src/rpc/virnetserverclient.h
+++ b/src/rpc/virnetserverclient.h
@@ -73,7 +73,11 @@ virNetServerClientPtr virNetServerClientNew(unsigned long long id,
                                             virNetServerClientPrivPreExecRestart privPreExecRestart,
                                             virFreeCallback privFree,
                                             void *privOpaque)
+# ifdef WITH_GNUTLS
     ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(7) ATTRIBUTE_NONNULL(9);
+# else
+    ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(6) ATTRIBUTE_NONNULL(8);
+# endif
 
 virNetServerClientPtr virNetServerClientNewPostExecRestart(virNetServerPtr srv,
                                                            virJSONValuePtr object,
-- 
2.14.3




More information about the libvir-list mailing list