]> xenbits.xensource.com Git - libvirt.git/commitdiff
virSecretLoadAllConfigs: Use g_autofree for @path
authorMichal Privoznik <mprivozn@redhat.com>
Mon, 16 Oct 2023 07:49:02 +0000 (09:49 +0200)
committerMichal Privoznik <mprivozn@redhat.com>
Tue, 17 Oct 2023 06:32:22 +0000 (08:32 +0200)
When loading virSecret configs, the @path variable holds path to
individual config files. In each iteration it is freed explicitly
using VIR_FREE(). Switch it to g_autofree and remove those
explicit calls.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/conf/virsecretobj.c

index e0393e6cecdcef3e777bc321c10b80137f97f6d8..2585b2c9729d471633726a4e241436c9117781c3 100644 (file)
@@ -902,7 +902,7 @@ virSecretLoadAllConfigs(virSecretObjList *secrets,
     /* Ignore errors reported by readdir or other calls within the
      * loop (if any).  It's better to keep the secrets we managed to find. */
     while (virDirRead(dir, &de, NULL) > 0) {
-        char *path;
+        g_autofree char *path = NULL;
         virSecretObj *obj;
 
         if (!virStringHasSuffix(de->d_name, ".xml"))
@@ -914,11 +914,9 @@ virSecretLoadAllConfigs(virSecretObjList *secrets,
         if (!(obj = virSecretLoad(secrets, de->d_name, path, configDir))) {
             VIR_ERROR(_("Error reading secret: %1$s"),
                       virGetLastErrorMessage());
-            VIR_FREE(path);
             continue;
         }
 
-        VIR_FREE(path);
         virSecretObjEndAPI(&obj);
     }