From 88669478e9470e1fbb6a945c676e44743dba513d Mon Sep 17 00:00:00 2001
From: John Ferlan <jferlan@redhat.com>
Date: Thu, 6 Dec 2018 12:33:57 -0500
Subject: [PATCH] tools: 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>
---
 tools/virsh.c      | 7 ++-----
 tools/virt-admin.c | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/tools/virsh.c b/tools/virsh.c
index 4aae877160..a3553ddd36 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -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);
     }
diff --git a/tools/virt-admin.c b/tools/virt-admin.c
index e2ed272a04..3aada5f963 100644
--- a/tools/virt-admin.c
+++ b/tools/virt-admin.c
@@ -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
-- 
GitLab