External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

tools: Use consistent error preservation and restoration calls

Browse Source 
Provide some consistency over error message variable name and usage
when saving error messages across possible other errors or possibility
of resetting of the last error.

Instead of virSaveLastError paired up with virSetError and virFreeError,
we should use the newer virErrorPreserveLast and virRestoreError.

Signed-off-by: John Ferlan <jferlan@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
John Ferlan 2018-12-06 12:33:57 -05:00
parent 29565c5013
commit 88669478e9
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/virsh.c
View File

@ -93,7 +93,7 @@ virshCatchDisconnect(virConnectPtr conn,
virErrorPtr error;
char *uri;
error = virSaveLastError();
virErrorPreserveLast(&error);
uri = virConnectGetURI(conn);
switch ((virConnectCloseReason) reason) {
@ -114,10 +114,7 @@ virshCatchDisconnect(virConnectPtr conn,
vshError(ctl, _(str), NULLSTR(uri));
VIR_FREE(uri);
if (error) {
virSetError(error);
virFreeError(error);
}
virErrorRestore(&error);
disconnected++;
vshEventDone(ctl);
}

7
tools/virt-admin.c
View File

@ -124,7 +124,7 @@ vshAdmCatchDisconnect(virAdmConnectPtr conn G_GNUC_UNUSED,
if (reason == VIR_CONNECT_CLOSE_REASON_CLIENT)
return;
error = virSaveLastError();
virErrorPreserveLast(&error);
uri = virAdmConnectGetURI(conn);
switch ((virConnectCloseReason) reason) {
@ -146,10 +146,7 @@ vshAdmCatchDisconnect(virAdmConnectPtr conn G_GNUC_UNUSED,
vshError(ctl, _(str), NULLSTR(uri));
VIR_FREE(uri);
if (error) {
virSetError(error);
virFreeError(error);
}
virErrorRestore(&error);
}
static int