remote: remove unnecessary return value and if branch

Function daemonConfigFilePath() will assign a path to
remote_config_file definitely and the path will be validated
in following codes. So, it's unnecessary to return value
from daemonConfigFilePath() and check the returned value.

Signed-off-by: jiangjiacheng <jiangjiacheng@huawei.com>
Reviewed-by: Kristina Hanicova <khanicov@redhat.com>

diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c
index 23a5eeb20078ff7f4f24ad2fadde31a6d79b17d0..36d95de83d5d71c55c3fa75f69939e4a6fcb0acb 100644 (file)
--- a/src/remote/remote_daemon.c
+++ b/src/remote/remote_daemon.c
@@ -903,11 +903,7 @@ int main(int argc, char **argv) {
     /* No explicit config, so try and find a default one */
     if (remote_config_file == NULL) {
         implicit_conf = true;
-        if (daemonConfigFilePath(privileged,
-                                 &remote_config_file) < 0) {
-            VIR_ERROR(_("Can't determine config path"));
-            exit(EXIT_FAILURE);
-        }
+        daemonConfigFilePath(privileged, &remote_config_file);
     }
 
     /* Read the config file if it exists */

diff --git a/src/remote/remote_daemon_config.c b/src/remote/remote_daemon_config.c
index 330db54651f1fc781850e08dd8931176ac561dc0..3567e337c459176f96862e86567055f9d56606ad 100644 (file)
--- a/src/remote/remote_daemon_config.c
+++ b/src/remote/remote_daemon_config.c
@@ -72,7 +72,7 @@ remoteConfigGetAuth(virConf *conf,
     return 0;
 }
 
-int
+void
 daemonConfigFilePath(bool privileged, char **configfile)
 {
     if (privileged) {
@@ -84,8 +84,6 @@ daemonConfigFilePath(bool privileged, char **configfile)
 
         *configfile = g_strdup_printf("%s/%s.conf", configdir, DAEMON_NAME);
     }
-
-    return 0;
 }
 
 struct daemonConfig*

diff --git a/src/remote/remote_daemon_config.h b/src/remote/remote_daemon_config.h
index 47839271d315e2db9dab9b855a57346ffbca843b..9f9e54e8381c1ecbacd3f4a644d421e569ca1ac7 100644 (file)
--- a/src/remote/remote_daemon_config.h
+++ b/src/remote/remote_daemon_config.h
@@ -99,7 +99,7 @@ struct daemonConfig {
 };
 
 
-int daemonConfigFilePath(bool privileged, char **configfile);
+void daemonConfigFilePath(bool privileged, char **configfile);
 struct daemonConfig* daemonConfigNew(bool privileged);
 void daemonConfigFree(struct daemonConfig *data);
 int daemonConfigLoadFile(struct daemonConfig *data,