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

diff --git a/daemon/scrub.c b/daemon/scrub.c
index 6e205a0..f1601f9 100644
--- a/daemon/scrub.c
+++ b/daemon/scrub.c
@@ -33,7 +33,7 @@ do_scrub_device (char *device)
   char *err;
   int r;
 
-  IS_DEVICE (device, -1);
+  RESOLVE_DEVICE (device, return -1);
 
   r = command (NULL, &err, "scrub", device, NULL);
   if (r == -1) {
@@ -55,7 +55,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 +85,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);