diff options
| author | Jim Meyering <meyering@redhat.com> | 2009-08-10 19:02:12 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2009-08-13 14:45:33 +0200 |
| commit | 4a5e13f15734aa7363e605f716ad6e29c67475c5 (patch) | |
| tree | 88956b2ae115c6ab304e565e333c930698f47ada /daemon/daemon.h | |
| parent | e8795f3e9cc7e60a5ad709c0e3b53f60e37fd6c0 (diff) | |
| download | libguestfs-4a5e13f15734aa7363e605f716ad6e29c67475c5.tar.gz libguestfs-4a5e13f15734aa7363e605f716ad6e29c67475c5.tar.xz libguestfs-4a5e13f15734aa7363e605f716ad6e29c67475c5.zip | |
propagate semantic changes to NEED_ROOT, NEED_ROOT_OR_IS_DEVICE
changing IS_DEVICE semantics leads to changing semantics of
NEED_ROOT_OR_IS_DEVICE and NEED_ROOT, too.
* daemon/daemon.h: Update definitions.
Diffstat (limited to 'daemon/daemon.h')
| -rw-r--r-- | daemon/daemon.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/daemon/daemon.h b/daemon/daemon.h index bebc86f1..8bc63449 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) |