openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

virsh: checkpoint: move variables inside the loop 

Use g_auto to free them instead of open-coding it.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Ján Tomko 2021-08-10 19:26:45 +02:00
parent 6c96bf6bbf
commit 7f1c6736fa
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/virsh-checkpoint.c
View File

@ -716,9 +716,6 @@ cmdCheckpointList(vshControl *ctl,
bool ret = false;
unsigned int flags = 0;
size_t i;
xmlDocPtr xml = NULL;
xmlXPathContextPtr ctxt = NULL;
char *doc = NULL;
virDomainCheckpointPtr checkpoint = NULL;
long long creation_longlong;
g_autoptr(GDateTime) then = NULL;
@ -728,7 +725,6 @@ cmdCheckpointList(vshControl *ctl,
bool parent = vshCommandOptBool(cmd, "parent");
bool roots = vshCommandOptBool(cmd, "roots");
const char *from_chk = NULL;
char *parent_chk = NULL;
virDomainCheckpointPtr start = NULL;
struct virshCheckpointList *checkpointlist = NULL;
vshTable *table = NULL;
@ -805,14 +801,12 @@ cmdCheckpointList(vshControl *ctl,
for (i = 0; i < checkpointlist->nchks; i++) {
g_autofree gchar *thenstr = NULL;
g_autoptr(xmlDoc) xml = NULL;
g_autoptr(xmlXPathContext) ctxt = NULL;
g_autofree char *parent_chk = NULL;
g_autofree char *doc = NULL;
const char *chk_name;
/* free up memory from previous iterations of the loop */
VIR_FREE(parent_chk);
xmlXPathFreeContext(ctxt);
xmlFreeDoc(xml);
VIR_FREE(doc);
checkpoint = checkpointlist->chks[i].chk;
chk_name = virDomainCheckpointGetName(checkpoint);
assert(chk_name);
@ -856,13 +850,8 @@ cmdCheckpointList(vshControl *ctl,
ret = true;
cleanup:
/* this frees up memory from the last iteration of the loop */
virshCheckpointListFree(checkpointlist);
VIR_FREE(parent_chk);
virshDomainCheckpointFree(start);
xmlXPathFreeContext(ctxt);
xmlFreeDoc(xml);
VIR_FREE(doc);
virshDomainFree(dom);
vshTableFree(table);