X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fscrub.c;h=2beaea31b399daefaef94e3712a620058d0ab4f8;hp=6e205a01ad4369ad828f4a9d53c21bac013058aa;hb=0c07f0d23698798475e0d09491812aca52440328;hpb=78029b529ad98769685d607230b70f71832d5906

diff --git a/daemon/scrub.c b/daemon/scrub.c
index 6e205a0..2beaea3 100644
--- a/daemon/scrub.c
+++ b/daemon/scrub.c
@@ -33,8 +33,6 @@ do_scrub_device (char *device)
   char *err;
   int r;
 
-  IS_DEVICE (device, -1);
-
   r = command (NULL, &err, "scrub", device, NULL);
   if (r == -1) {
     reply_with_error ("scrub_device: %s: %s", device, err);
@@ -55,7 +53,7 @@ do_scrub_file (char *file)
   int r;
 
   NEED_ROOT (-1);
-  ABS_PATH (file, -1);
+  ABS_PATH (file, return -1);
 
   /* Make the path relative to /sysroot. */
   buf = sysroot_path (file);
@@ -85,7 +83,7 @@ do_scrub_freespace (char *dir)
   int r;
 
   NEED_ROOT (-1);
-  ABS_PATH (dir, -1);
+  ABS_PATH (dir, return -1);
 
   /* Make the path relative to /sysroot. */
   buf = sysroot_path (dir);