s/NEED_ROOT_OR_IS_DEVICE/REQUIRE_ROOT_OR_RESOLVE_DEVICE/

This commit is contained in:
Jim Meyering
2009-08-10 19:10:14 +02:00
parent ecd828beb2
commit fc266e5ab8
3 changed files with 3 additions and 3 deletions

View File

@@ -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); \

View File

@@ -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;

View File

@@ -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;