From: Jim Meyering <meyering@redhat.com>
Date: Mon, 10 Aug 2009 16:54:51 +0000 (+0200)
Subject: convert the last few, manually
X-Git-Tag: 1.0.67~32
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=e8795f3e9cc7e60a5ad709c0e3b53f60e37fd6c0;p=libguestfs.git

convert the last few, manually
---

diff --git a/daemon/daemon.h b/daemon/daemon.h
index 166f3bf..bebc86f 100644
--- a/daemon/daemon.h
+++ b/daemon/daemon.h
@@ -174,7 +174,7 @@ extern void reply (xdrproc_t xdrp, char *ret);
 #define NEED_ROOT_OR_IS_DEVICE(path,errcode) \
   do {									\
     if (strncmp ((path), "/dev/", 5) == 0)				\
-      IS_DEVICE ((path),(errcode));					\
+      RESOLVE_DEVICE ((path), return errcode);				\
     else {								\
       NEED_ROOT ((errcode));						\
       ABS_PATH ((path),(errcode));					\
diff --git a/daemon/sfdisk.c b/daemon/sfdisk.c
index 693e89a..a504141 100644
--- a/daemon/sfdisk.c
+++ b/daemon/sfdisk.c
@@ -53,7 +53,7 @@ sfdisk (char *device, int n, int cyls, int heads, int sectors,
   if (extra_flag)
     sprintf (buf + strlen (buf), " %s", extra_flag);
 
-  /* Safe because of IS_DEVICE above: */
+  /* Safe because of RESOLVE_DEVICE above: */
   sprintf (buf + strlen (buf), " %s", device);
 
   if (verbose)