rpc: Make some functions void

There are few functions that currently return an integer but in
fact they always return the same integer (zero). Make them void.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c
index 9c20a80b889fe462ffbd2d953ce85bb6ac069bed..0a566eaa54f0ff3804b833d98808922462c7c1ee 100644 (file)
--- a/src/rpc/virnetlibsshsession.c
+++ b/src/rpc/virnetlibsshsession.c
@@ -1082,11 +1082,10 @@ virNetLibsshSessionAuthAddKeyboardAuth(virNetLibsshSessionPtr sess,
 
 }
 
-int
+void
 virNetLibsshSessionSetChannelCommand(virNetLibsshSessionPtr sess,
                                       const char *command)
 {
-    int ret = 0;
     virObjectLock(sess);
 
     VIR_FREE(sess->channelCommand);
@@ -1094,7 +1093,6 @@ virNetLibsshSessionSetChannelCommand(virNetLibsshSessionPtr sess,
     sess->channelCommand = g_strdup(command);
 
     virObjectUnlock(sess);
-    return ret;
 }
 
 int

diff --git a/src/rpc/virnetlibsshsession.h b/src/rpc/virnetlibsshsession.h
index 231c2591b20fa0b265001bcff3d875f657c6d3ed..e982bcd2ef3b731641cb0fa79fa5f501014bf148 100644 (file)
--- a/src/rpc/virnetlibsshsession.h
+++ b/src/rpc/virnetlibsshsession.h
@@ -35,8 +35,8 @@ typedef enum {
     VIR_NET_LIBSSH_HOSTKEY_VERIFY_IGNORE
 } virNetLibsshHostkeyVerify;
 
-int virNetLibsshSessionSetChannelCommand(virNetLibsshSessionPtr sess,
-                                         const char *command);
+void virNetLibsshSessionSetChannelCommand(virNetLibsshSessionPtr sess,
+                                          const char *command);
 
 int virNetLibsshSessionAuthSetCallback(virNetLibsshSessionPtr sess,
                                        virConnectAuthPtr auth);

diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index 6c790cb577003b64da01816a1e99db259146420c..3ea863f625d4fb48923f60daf08f3430dace5b0c 100644 (file)
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -969,8 +969,7 @@ virNetSocketNewConnectLibSSH2(const char *host,
                                                VIR_NET_SSH_HOSTKEY_FILE_CREATE) != 0)
         goto error;
 
-    if (virNetSSHSessionSetChannelCommand(sess, command) != 0)
-        goto error;
+    virNetSSHSessionSetChannelCommand(sess, command);
 
     if (!(authMethodList = virStringSplit(authMethods, ",", 0)))
         goto error;
@@ -1101,8 +1100,7 @@ virNetSocketNewConnectLibssh(const char *host,
                                                   verify) != 0)
         goto error;
 
-    if (virNetLibsshSessionSetChannelCommand(sess, command) != 0)
-        goto error;
+    virNetLibsshSessionSetChannelCommand(sess, command);
 
     if (!(authMethodList = virStringSplit(authMethods, ",", 0)))
         goto error;

diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c
index fabdc3ef22f0e9942daca8d3168d6a3a530472b9..b4dea154522003787668ee84fccad33221adf576 100644 (file)
--- a/src/rpc/virnetsshsession.c
+++ b/src/rpc/virnetsshsession.c
@@ -1132,11 +1132,10 @@ virNetSSHSessionAuthAddKeyboardAuth(virNetSSHSessionPtr sess,
 
 }
 
-int
+void
 virNetSSHSessionSetChannelCommand(virNetSSHSessionPtr sess,
                                   const char *command)
 {
-    int ret = 0;
     virObjectLock(sess);
 
     VIR_FREE(sess->channelCommand);
@@ -1144,7 +1143,6 @@ virNetSSHSessionSetChannelCommand(virNetSSHSessionPtr sess,
     sess->channelCommand = g_strdup(command);
 
     virObjectUnlock(sess);
-    return ret;
 }
 
 int

diff --git a/src/rpc/virnetsshsession.h b/src/rpc/virnetsshsession.h
index 010148930238e5d6b27b25e3ab9210e0d5e8d5f5..4d639da4534dcadb38afd848ca21f9534cc1a8cb 100644 (file)
--- a/src/rpc/virnetsshsession.h
+++ b/src/rpc/virnetsshsession.h
@@ -40,8 +40,8 @@ typedef enum {
     VIR_NET_SSH_HOSTKEY_FILE_CREATE   = 1 << 1,
 } virNetSSHHostKeyFileFlags;
 
-int virNetSSHSessionSetChannelCommand(virNetSSHSessionPtr sess,
-                                      const char *command);
+void virNetSSHSessionSetChannelCommand(virNetSSHSessionPtr sess,
+                                       const char *command);
 
 void virNetSSHSessionAuthReset(virNetSSHSessionPtr sess);