diff options
| author | Jim Meyering <meyering@redhat.com> | 2009-08-10 19:10:14 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2009-08-13 14:45:34 +0200 |
| commit | fc266e5ab8c4f013d0e473029c5e0b4cd32cca92 (patch) | |
| tree | 05c951a357c89cfcb8dc5d6dcaed537698ac2ce1 | |
| parent | ecd828beb250648541492a69a188a71305897e4e (diff) | |
| download | libguestfs-fc266e5ab8c4f013d0e473029c5e0b4cd32cca92.tar.gz libguestfs-fc266e5ab8c4f013d0e473029c5e0b4cd32cca92.tar.xz libguestfs-fc266e5ab8c4f013d0e473029c5e0b4cd32cca92.zip | |
s/NEED_ROOT_OR_IS_DEVICE/REQUIRE_ROOT_OR_RESOLVE_DEVICE/
| -rw-r--r-- | daemon/daemon.h | 2 | ||||
| -rw-r--r-- | daemon/file.c | 2 | ||||
| -rw-r--r-- | daemon/upload.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/daemon/daemon.h b/daemon/daemon.h index 8bc63449..cbcab639 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -171,7 +171,7 @@ 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,fail_stmt) \ +#define REQUIRE_ROOT_OR_RESOLVE_DEVICE(path,fail_stmt) \ do { \ if (strncmp ((path), "/dev/", 5) == 0) \ RESOLVE_DEVICE ((path), fail_stmt); \ diff --git a/daemon/file.c b/daemon/file.c index 9cc324fb..2ba2aab7 100644 --- a/daemon/file.c +++ b/daemon/file.c @@ -391,7 +391,7 @@ do_file (char *path) char *buf; int len; - NEED_ROOT_OR_IS_DEVICE (path, return NULL); + REQUIRE_ROOT_OR_RESOLVE_DEVICE (path, return NULL); if (strncmp (path, "/dev/", 5) == 0) buf = (char *) path; diff --git a/daemon/upload.c b/daemon/upload.c index 7815e234..5c1adaf6 100644 --- a/daemon/upload.c +++ b/daemon/upload.c @@ -93,7 +93,7 @@ do_download (char *filename) int fd, r, is_dev; char buf[GUESTFS_MAX_CHUNK_SIZE]; - NEED_ROOT_OR_IS_DEVICE (filename, return -1); + REQUIRE_ROOT_OR_RESOLVE_DEVICE (filename, return -1); is_dev = strncmp (filename, "/dev/", 5) == 0; |