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

src: Use consistent error preservation and restoration calls 

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:32:18 -05:00
parent 4e7b3b1ebd
commit 532e9a349b
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/libvirt-stream.c
View File

@ -622,12 +622,11 @@ virStreamSendAll(virStreamPtr stream,
VIR_FREE(bytes);
if (ret != 0) {
virErrorPtr orig_err = virSaveLastError();
virErrorPtr orig_err;
virErrorPreserveLast(&orig_err);
virStreamAbort(stream);
if (orig_err) {
virSetError(orig_err);
virFreeError(orig_err);
}
virErrorRestore(&orig_err);
virDispatchError(stream->conn);
}
@ -794,12 +793,11 @@ int virStreamSparseSendAll(virStreamPtr stream,
VIR_FREE(bytes);
if (ret != 0) {
virErrorPtr orig_err = virSaveLastError();
virErrorPtr orig_err;
virErrorPreserveLast(&orig_err);
virStreamAbort(stream);
if (orig_err) {
virSetError(orig_err);
virFreeError(orig_err);
}
virErrorRestore(&orig_err);
virDispatchError(stream->conn);
}
@ -900,12 +898,11 @@ virStreamRecvAll(virStreamPtr stream,
VIR_FREE(bytes);
if (ret != 0) {
virErrorPtr orig_err = virSaveLastError();
virErrorPtr orig_err;
virErrorPreserveLast(&orig_err);
virStreamAbort(stream);
if (orig_err) {
virSetError(orig_err);
virFreeError(orig_err);
}
virErrorRestore(&orig_err);
virDispatchError(stream->conn);
}
@ -1034,12 +1031,11 @@ virStreamSparseRecvAll(virStreamPtr stream,
VIR_FREE(bytes);
if (ret != 0) {
virErrorPtr orig_err = virSaveLastError();
virErrorPtr orig_err;
virErrorPreserveLast(&orig_err);
virStreamAbort(stream);
if (orig_err) {
virSetError(orig_err);
virFreeError(orig_err);
}
virErrorRestore(&orig_err);
virDispatchError(stream->conn);
}