utils: Remove ATTRIBUTE_NONNULL(1) from virCommandSetSendBuffer

Remove the ATTRIBUTE_NONNULL(1) from virCommandSetSendBuffer()
prototype since we are checking for '!cmd' and move the initialization
if 'i' after the test for '!cmd'.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
Message-Id: <20190726205633.2041912-4-stefanb@linux.vnet.ibm.com>

diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index 774038e536a2d7af8c9e4814bd25a0b60273b237..2df71014f84620d97fab39f5818ad11ea4796f62 100644 (file)
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -1775,7 +1775,7 @@ virCommandSetSendBuffer(virCommandPtr cmd,
                         int fd,
                         unsigned char *buffer, size_t buflen)
 {
-    size_t i = virCommandGetNumSendBuffers(cmd);
+    size_t i;
 
     if (!cmd || cmd->has_error)
         return -1;
@@ -1787,6 +1787,7 @@ virCommandSetSendBuffer(virCommandPtr cmd,
         return -1;
     }
 
+    i = virCommandGetNumSendBuffers(cmd);
     if (VIR_REALLOC_N(cmd->sendBuffers, i + 1) < 0) {
         cmd->has_error = ENOMEM;
         return -1;

diff --git a/src/util/vircommand.h b/src/util/vircommand.h
index c2abc7b2c3ef05fb9c96b3a3a892180960971a8e..74574e3fb135a313d0b9223630c96e0f750ef67c 100644 (file)
--- a/src/util/vircommand.h
+++ b/src/util/vircommand.h
@@ -149,7 +149,7 @@ void virCommandSetWorkingDirectory(virCommandPtr cmd,
 int virCommandSetSendBuffer(virCommandPtr cmd,
                             int fd,
                             unsigned char *buffer, size_t buflen)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3);
+    ATTRIBUTE_NONNULL(3);
 
 void virCommandSetInputBuffer(virCommandPtr cmd,
                               const char *inbuf) ATTRIBUTE_NONNULL(2);