Cleanups after adopting g_get_*_dir()

[libvirt] [PATCH 17/42] remote: Don't check the output of virGetUserConfigDirectory()

Posted by Fabiano Fidêncio 6 years, 1 month ago

virGetUserConfigDirectory() *never* *ever* returns NULL, making the
checks for it completely unnecessary.

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
---
 src/remote/remote_daemon_config.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/remote/remote_daemon_config.c b/src/remote/remote_daemon_config.c
index ae6b491686..84e331474b 100644
--- a/src/remote/remote_daemon_config.c
+++ b/src/remote/remote_daemon_config.c
@@ -81,17 +81,13 @@ daemonConfigFilePath(bool privileged, char **configfile)
     } else {
         char *configdir = NULL;
 
-        if (!(configdir = virGetUserConfigDirectory()))
-            goto error;
+        configdir = virGetUserConfigDirectory();
 
         *configfile = g_strdup_printf("%s/%s.conf", configdir, DAEMON_NAME);
         VIR_FREE(configdir);
     }
 
     return 0;
-
- error:
-    return -1;
 }
 
 struct daemonConfig*
-- 
2.24.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH 17/42] remote: Don't check the output of virGetUserConfigDirectory()

Posted by Ján Tomko 6 years, 1 month ago

On Thu, Dec 19, 2019 at 11:04:22AM +0100, Fabiano Fidêncio wrote:
>virGetUserConfigDirectory() *never* *ever* returns NULL, making the
>checks for it completely unnecessary.
>
>Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
>---
> src/remote/remote_daemon_config.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
>diff --git a/src/remote/remote_daemon_config.c b/src/remote/remote_daemon_config.c
>index ae6b491686..84e331474b 100644
>--- a/src/remote/remote_daemon_config.c
>+++ b/src/remote/remote_daemon_config.c
>@@ -81,17 +81,13 @@ daemonConfigFilePath(bool privileged, char **configfile)
>     } else {
>         char *configdir = NULL;
>
>-        if (!(configdir = virGetUserConfigDirectory()))
>-            goto error;
>+        configdir = virGetUserConfigDirectory();
>
>         *configfile = g_strdup_printf("%s/%s.conf", configdir, DAEMON_NAME);
>         VIR_FREE(configdir);

Another g_autofree opportunity

>     }
>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

Jano
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list