convert the last few, manually
authorJim Meyering <meyering@redhat.com>
Mon, 10 Aug 2009 16:54:51 +0000 (18:54 +0200)
committerJim Meyering <meyering@redhat.com>
Thu, 13 Aug 2009 12:45:33 +0000 (14:45 +0200)
daemon/daemon.h
daemon/sfdisk.c

index 166f3bf..bebc86f 100644 (file)
@@ -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));                                     \
index 693e89a..a504141 100644 (file)
@@ -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)