s/NEED_ROOT_OR_IS_DEVICE/REQUIRE_ROOT_OR_RESOLVE_DEVICE/

diff --git a/daemon/daemon.h b/daemon/daemon.h
index 8bc6344..cbcab63 100644 (file)
--- 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.
  */
  * 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);                              \
   do {                                                                 \
     if (strncmp ((path), "/dev/", 5) == 0)                             \
       RESOLVE_DEVICE ((path), fail_stmt);                              \

diff --git a/daemon/file.c b/daemon/file.c
index 9cc324f..2ba2aab 100644 (file)
--- a/daemon/file.c
+++ b/daemon/file.c
@@ -391,7 +391,7 @@ do_file (char *path)
   char *buf;
   int len;
 
   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;
 
   if (strncmp (path, "/dev/", 5) == 0)
     buf = (char *) path;

diff --git a/daemon/upload.c b/daemon/upload.c
index 7815e23..5c1adaf 100644 (file)
--- 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];
 
   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;
 
 
   is_dev = strncmp (filename, "/dev/", 5) == 0;