[PATCH 28/40] virStorageBackendSheepdogAddVolume: Clean up memory handling
'cells' can be pushed into the loop removing the need for manual
cleanup, the check whether 'line' is NULL inside of the loop is always
false since the loop checks it right before and 'line' variable is
unnecessary.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/storage/storage_backend_sheepdog.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/storage/storage_backend_sheepdog.c
b/src/storage/storage_backend_sheepdog.c
index c5b7c568dd..178cfbae11 100644
--- a/src/storage/storage_backend_sheepdog.c
+++ b/src/storage/storage_backend_sheepdog.c
@@ -140,7 +140,6 @@ virStorageBackendSheepdogRefreshAllVol(virStoragePoolObjPtr pool)
size_t i;
g_autofree char *output = NULL;
g_auto(GStrv) lines = NULL;
- g_auto(GStrv) cells = NULL;
g_autoptr(virCommand) cmd = NULL;
cmd = virCommandNewArgList(SHEEPDOGCLI, "vdi", "list",
"-r", NULL);
@@ -154,20 +153,15 @@ virStorageBackendSheepdogRefreshAllVol(virStoragePoolObjPtr pool)
return -1;
for (i = 0; lines[i]; i++) {
- const char *line = lines[i];
- if (line == NULL)
- break;
+ g_auto(GStrv) cells = NULL;
- cells = virStringSplit(line, " ", 0);
+ cells = virStringSplit(lines[i], " ", 0);
if (cells != NULL &&
virStringListLength((const char * const *)cells) > 2) {
if (virStorageBackendSheepdogAddVolume(pool, cells[1]) < 0)
return -1;
}
-
- g_strfreev(cells);
- cells = NULL;
}
return 0;
--
2.29.2