[PATCH 02/10] rpc: change 'isServer' parameter from 'int' to 'bool'

Daniel P. Berrangé via Devel posted 10 patches 2 weeks ago
[PATCH 02/10] rpc: change 'isServer' parameter from 'int' to 'bool'
Posted by Daniel P. Berrangé via Devel 2 weeks ago
From: Daniel P. Berrangé <berrange@redhat.com>

The callers are all passing in a 'bool' value, and this type
should be maintained rather than cast to 'int' and then
inpreted as a bool again later.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 src/rpc/virnettlsconfig.c | 14 +++++++-------
 src/rpc/virnettlsconfig.h | 13 +++++++------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/rpc/virnettlsconfig.c b/src/rpc/virnettlsconfig.c
index d020083d6a..ffab3b4fc8 100644
--- a/src/rpc/virnettlsconfig.c
+++ b/src/rpc/virnettlsconfig.c
@@ -49,7 +49,7 @@ static void virNetTLSConfigTrust(const char *cacertdir,
     VIR_DEBUG("TLS CA CRL %s", *cacrl);
 }
 
-static void virNetTLSConfigIdentity(int isServer,
+static void virNetTLSConfigIdentity(bool isServer,
                                     const char *certdir,
                                     const char *keydir,
                                     char **cert,
@@ -102,7 +102,7 @@ void virNetTLSConfigSystemTrust(char **cacert,
 }
 
 void virNetTLSConfigCustomIdentity(const char *pkipath,
-                                   int isServer,
+                                   bool isServer,
                                    char **cert,
                                    char **key)
 {
@@ -114,7 +114,7 @@ void virNetTLSConfigCustomIdentity(const char *pkipath,
                             key);
 }
 
-void virNetTLSConfigUserIdentity(int isServer,
+void virNetTLSConfigUserIdentity(bool isServer,
                                  char **cert,
                                  char **key)
 {
@@ -129,7 +129,7 @@ void virNetTLSConfigUserIdentity(int isServer,
                             key);
 }
 
-void virNetTLSConfigSystemIdentity(int isServer,
+void virNetTLSConfigSystemIdentity(bool isServer,
                                    char **cert,
                                    char **key)
 {
@@ -143,7 +143,7 @@ void virNetTLSConfigSystemIdentity(int isServer,
 }
 
 void virNetTLSConfigCustomCreds(const char *pkipath,
-                                int isServer,
+                                bool isServer,
                                 char **cacert,
                                 char **cacrl,
                                 char **cert,
@@ -161,7 +161,7 @@ void virNetTLSConfigCustomCreds(const char *pkipath,
                             key);
 }
 
-void virNetTLSConfigUserCreds(int isServer,
+void virNetTLSConfigUserCreds(bool isServer,
                               char **cacert,
                               char **cacrl,
                               char **cert,
@@ -182,7 +182,7 @@ void virNetTLSConfigUserCreds(int isServer,
                             key);
 }
 
-void virNetTLSConfigSystemCreds(int isServer,
+void virNetTLSConfigSystemCreds(bool isServer,
                                 char **cacert,
                                 char **cacrl,
                                 char **cert,
diff --git a/src/rpc/virnettlsconfig.h b/src/rpc/virnettlsconfig.h
index 797b3e3ac5..a9378c18b7 100644
--- a/src/rpc/virnettlsconfig.h
+++ b/src/rpc/virnettlsconfig.h
@@ -20,6 +20,7 @@
 
 #pragma once
 
+#include "internal.h"
 #include "configmake.h"
 
 #define LIBVIRT_PKI_DIR SYSCONFDIR "/pki"
@@ -39,29 +40,29 @@ void virNetTLSConfigSystemTrust(char **cacert,
                                 char **cacrl);
 
 void virNetTLSConfigCustomIdentity(const char *pkipath,
-                                   int isServer,
+                                   bool isServer,
                                    char **cert,
                                    char **key);
-void virNetTLSConfigUserIdentity(int isServer,
+void virNetTLSConfigUserIdentity(bool isServer,
                                  char **cert,
                                  char **key);
-void virNetTLSConfigSystemIdentity(int isServer,
+void virNetTLSConfigSystemIdentity(bool isServer,
                                    char **cert,
                                    char **key);
 
 
 void virNetTLSConfigCustomCreds(const char *pkipath,
-                                int isServer,
+                                bool isServer,
                                 char **cacert,
                                 char **cacrl,
                                 char **cert,
                                 char **key);
-void virNetTLSConfigUserCreds(int isServer,
+void virNetTLSConfigUserCreds(bool isServer,
                               char **cacert,
                               char **cacrl,
                               char **cert,
                               char **key);
-void virNetTLSConfigSystemCreds(int isServer,
+void virNetTLSConfigSystemCreds(bool isServer,
                                 char **cacert,
                                 char **cacrl,
                                 char **cert,
-- 
2.51.1