]> xenbits.xensource.com Git - libvirt.git/commitdiff
secret: Use g_strdup_printf() instead of virAsprintf()
authorMichal Privoznik <mprivozn@redhat.com>
Tue, 22 Oct 2019 13:26:14 +0000 (15:26 +0200)
committerMichal Privoznik <mprivozn@redhat.com>
Tue, 12 Nov 2019 15:15:58 +0000 (16:15 +0100)
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
src/secret/secret_driver.c

index 6d2844f3b766a47c29c761796157e757683b8de0..5a5c84412a70d7b001e806e09783c50478dfa93e 100644 (file)
@@ -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) {