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, 2 insertions, 5 deletions

diff --git a/tests/charsets/test-charset-fidelity.c b/tests/charsets/test-charset-fidelity.c
index b358f2cd..d67787fe 100644
--- a/tests/charsets/test-charset-fidelity.c
+++ b/tests/charsets/test-charset-fidelity.c
@@ -448,15 +448,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;
 }