From: Daniel P. Berrangé <berrange@redhat.com>
Date: Thu, 1 Feb 2018 15:34:39 +0000 (+0000)
Subject: rpc: fix non-NULL annotations when GNUTLS is disabled
X-Git-Tag: v4.1.0-rc1~208
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b9fe756ecbc071f7babb5f542fd97e1c1d39397;p=thirdparty%2Flibvirt.git

rpc: fix non-NULL annotations when GNUTLS is disabled

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

Reviewed-by: John Ferlan <jferlan@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

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,