From 39052d270fcce991238fc5f9939677b5d6e31d15 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 3 Nov 2010 16:15:48 +0000 Subject: [PATCH 1/1] fuse: Use guestfs_last_errno instead of errno-reversal-hack. --- fuse/guestmount.c | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/fuse/guestmount.c b/fuse/guestmount.c index 068f7de..a32da6b 100644 --- a/fuse/guestmount.c +++ b/fuse/guestmount.c @@ -64,40 +64,10 @@ int inspector = 0; const char *libvirt_uri; int dir_cache_timeout = 60; -/* This is ugly: guestfs errors are strings, FUSE wants -errno. We - * have to do the conversion as best we can. - */ -#define MAX_ERRNO 256 - static int error (void) { - int i; - const char *err = guestfs_last_error (g); - - if (!err) - return -EINVAL; - - if (verbose) - fprintf (stderr, "%s\n", err); - - /* Add a few of our own ... */ - - /* This indicates guestfsd died. Translate into a hard EIO error. - * Arguably we could relaunch the guest if we hit this error. - */ - if (strstr (err, "call launch before using this function")) - return -EIO; - - /* See if it matches an errno string in the host. */ - for (i = 0; i < MAX_ERRNO; ++i) { - const char *e = strerror (i); - if (e && strstr (err, e) != NULL) - return -i; - } - - /* Too bad, return a generic error. */ - return -EINVAL; + return -guestfs_last_errno (g); } static struct guestfs_xattr_list * -- 1.8.3.1