From 837f5619e79ff8e395bbff7039d22864838cff27 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Tue, 22 Oct 2019 15:26:14 +0200 Subject: [PATCH] secret: Use g_strdup_printf() instead of virAsprintf() Signed-off-by: Michal Privoznik Reviewed-by: Daniel Henrique Barboza --- src/secret/secret_driver.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 6d2844f3b7..5a5c84412a 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -469,25 +469,19 @@ secretStateInitialize(bool privileged, driver->privileged = privileged; if (privileged) { - if (virAsprintf(&driver->configDir, - "%s/libvirt/secrets", SYSCONFDIR) < 0) - goto error; - if (virAsprintf(&driver->stateDir, - "%s/libvirt/secrets", RUNSTATEDIR) < 0) - goto error; + driver->configDir = g_strdup_printf("%s/libvirt/secrets", SYSCONFDIR); + driver->stateDir = g_strdup_printf("%s/libvirt/secrets", RUNSTATEDIR); } else { g_autofree char *rundir = NULL; g_autofree char *cfgdir = NULL; if (!(cfgdir = virGetUserConfigDirectory())) goto error; - if (virAsprintf(&driver->configDir, "%s/secrets/", cfgdir) < 0) - goto error; + driver->configDir = g_strdup_printf("%s/secrets/", cfgdir); if (!(rundir = virGetUserRuntimeDirectory())) goto error; - if (virAsprintf(&driver->stateDir, "%s/secrets/run", rundir) < 0) - goto error; + driver->stateDir = g_strdup_printf("%s/secrets/run", rundir); } if (virFileMakePathWithMode(driver->configDir, S_IRWXU) < 0) {