tools: Modify existing tools to use guestfs_{push,pop}_error_handler.

This is a shorter and more convenient way to disable errors
temporarily across calls.

1 files changed, 4 insertions, 10 deletions

diff --git a/edit/virt-edit.c b/edit/virt-edit.c
index db480255..c34f044d 100644
--- a/edit/virt-edit.c
+++ b/edit/virt-edit.c
@@ -536,16 +536,13 @@ copy_attributes (const char *src, const char *dest)
    * attributes too?
    */
   if (has_linuxxattrs) {
-    guestfs_error_handler_cb old_error_cb;
-    void *old_error_data;
-    old_error_cb = guestfs_get_error_handler (g, &old_error_data);
-    guestfs_set_error_handler (g, NULL, NULL);
+    guestfs_push_error_handler (g, NULL, NULL);
 
     selinux_context = guestfs_getxattr (g, src, "security.selinux",
                                         &selinux_context_size);
     /* selinux_context could be NULL.  This isn't an error. */
 
-    guestfs_set_error_handler (g, old_error_cb, old_error_data);
+    guestfs_pop_error_handler (g);
   }
 
   /* Set the permissions (inc. sticky and set*id bits), UID, GID. */
@@ -578,15 +575,12 @@ feature_available (guestfs_h *g, const char *feature)
   /* If there's an error we should ignore it, so to do that we have to
    * temporarily replace the error handler with a null one.
    */
-  guestfs_error_handler_cb old_error_cb;
-  void *old_error_data;
-  old_error_cb = guestfs_get_error_handler (g, &old_error_data);
-  guestfs_set_error_handler (g, NULL, NULL);
+  guestfs_push_error_handler (g, NULL, NULL);
 
   const char *groups[] = { feature, NULL };
   int r = guestfs_available (g, (char * const *) groups);
 
-  guestfs_set_error_handler (g, old_error_cb, old_error_data);
+  guestfs_pop_error_handler (g);
 
   return r == 0 ? 1 : 0;
 }