logging: Change return type of virLogDaemonConfigFilePat to void

This function return value is invariant since 18f3771, so change
its type and remove all dependent checks.

Found by Linux Verification Center (linuxtesting.org) with Svace.

Reported-by: Pavel Nekrasov <p.nekrasov@fobos-nt.ru>
Signed-off-by: Alexander Kuznetsov <kuznetsovam@altlinux.org>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c
index 606aafd0715d849c7e02fe4dffaeca5b52f16726..16a5dcea9afc6464a65994b415f6eab5eacac0fc 100644 (file)
--- a/src/logging/log_daemon.c
+++ b/src/logging/log_daemon.c
@@ -692,14 +692,10 @@ int main(int argc, char **argv) {
         exit(EXIT_FAILURE);
     }
 
-    /* No explicit config, so try and find a default one */
+    /* No explicit config, so find a default one */
     if (remote_config_file == NULL) {
         implicit_conf = true;
-        if (virLogDaemonConfigFilePath(privileged,
-                                       &remote_config_file) < 0) {
-            VIR_ERROR(_("Can't determine config path"));
-            exit(EXIT_FAILURE);
-        }
+        virLogDaemonConfigFilePath(privileged, &remote_config_file);
     }
 
     /* Read the config file if it exists */

diff --git a/src/logging/log_daemon_config.c b/src/logging/log_daemon_config.c
index 248bd927d3f0aa7707324ccd24726adf48297ec8..60c424ad840b489a85790220e1b6c606573189b1 100644 (file)
--- a/src/logging/log_daemon_config.c
+++ b/src/logging/log_daemon_config.c
@@ -33,7 +33,7 @@
 VIR_LOG_INIT("logging.log_daemon_config");
 
 
-int
+void
 virLogDaemonConfigFilePath(bool privileged, char **configfile)
 {
     if (privileged) {
@@ -45,8 +45,6 @@ virLogDaemonConfigFilePath(bool privileged, char **configfile)
 
         *configfile = g_strdup_printf("%s/virtlogd.conf", configdir);
     }
-
-    return 0;
 }
 
 

diff --git a/src/logging/log_daemon_config.h b/src/logging/log_daemon_config.h
index 43922feedf6ea980389a135a741e8b1d4413c922..5c10cc50d755f0dd0d4d7315cfde86503a71ba26 100644 (file)
--- a/src/logging/log_daemon_config.h
+++ b/src/logging/log_daemon_config.h
@@ -39,7 +39,7 @@ struct _virLogDaemonConfig {
 };
 
 
-int virLogDaemonConfigFilePath(bool privileged, char **configfile);
+void virLogDaemonConfigFilePath(bool privileged, char **configfile);
 virLogDaemonConfig *virLogDaemonConfigNew(bool privileged);
 void virLogDaemonConfigFree(virLogDaemonConfig *data);
 int virLogDaemonConfigLoadFile(virLogDaemonConfig *data,