[Libguestfs] [PATCH libguestfs 05/23] propagate semantic changes to NEED_ROOT, NEED_ROOT_OR_IS_DEVICE

From: Jim Meyering <meyering(a)redhat.com&gt; changing IS_DEVICE semantics leads to changing semantics of NEED_ROOT_OR_IS_DEVICE and NEED_ROOT, too. * daemon/daemon.h: Update definitions. --- daemon/daemon.h | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/daemon/daemon.h b/daemon/daemon.h index bebc86f..8bc6344 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -124,11 +124,11 @@ extern void reply (xdrproc_t xdrp, char *ret); /* Helper for functions that need a root filesystem mounted. * NB. Cannot be used for FileIn functions. */ -#define NEED_ROOT(errcode) \ +#define NEED_ROOT(fail_stmt) \ do { \ if (!root_mounted) { \ reply_with_error ("%s: you must call 'mount' first to mount the root filesystem", __func__); \ - return (errcode); \ + fail_stmt; \ } \ } \ while (0) @@ -136,11 +136,11 @@ extern void reply (xdrproc_t xdrp, char *ret); /* Helper for functions that need an argument ("path") that is absolute. * NB. Cannot be used for FileIn functions. */ -#define ABS_PATH(path,errcode) \ +#define ABS_PATH(path,fail_stmt) \ do { \ if ((path)[0] != '/') { \ reply_with_error ("%s: path must start with a / character", __func__); \ - return (errcode); \ + fail_stmt; \ } \ } while (0) @@ -171,13 +171,13 @@ extern void reply (xdrproc_t xdrp, char *ret); * because we intend in future to make device parameters a distinct * type from filenames. */ -#define NEED_ROOT_OR_IS_DEVICE(path,errcode) \ +#define NEED_ROOT_OR_IS_DEVICE(path,fail_stmt) \ do { \ if (strncmp ((path), "/dev/", 5) == 0) \ - RESOLVE_DEVICE ((path), return errcode); \ + RESOLVE_DEVICE ((path), fail_stmt); \ else { \ - NEED_ROOT ((errcode)); \ - ABS_PATH ((path),(errcode)); \ + NEED_ROOT (fail_stmt); \ + ABS_PATH ((path),fail_stmt); \ } \ } while (0) -- 1.6.4.337.g5420e