NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

virsh: cmdDesc: Use 'vshTempFile' type to simplify cleanup

Browse Source 
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-03-01 17:02:59 +01:00
parent 8c35dcf9fc
commit c344784b88
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/virsh-domain.c
View File

@ -8335,7 +8335,6 @@ cmdDesc(vshControl *ctl, const vshCmd *cmd)
int type; int type;
char *desc = NULL; char *desc = NULL;
char *desc_edited = NULL; char *desc_edited = NULL;
char *tmp = NULL;
char *tmpstr; char *tmpstr;
const vshCmdOpt *opt = NULL; const vshCmdOpt *opt = NULL;
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
@ -8379,6 +8378,8 @@ cmdDesc(vshControl *ctl, const vshCmd *cmd)
} }
if (edit) { if (edit) {
g_autoptr(vshTempFile) tmp = NULL;
/* Create and open the temporary file. */ /* Create and open the temporary file. */
if (!(tmp = vshEditWriteToTempFile(ctl, desc))) if (!(tmp = vshEditWriteToTempFile(ctl, desc)))
goto cleanup; goto cleanup;
@ -8439,10 +8440,6 @@ cmdDesc(vshControl *ctl, const vshCmd *cmd)
cleanup: cleanup:
VIR_FREE(desc_edited); VIR_FREE(desc_edited);
VIR_FREE(desc); VIR_FREE(desc);
if (tmp) {
unlink(tmp);
VIR_FREE(tmp);
}
return ret; return ret;
} }