X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fscrub.c;h=15c8b6c26f99306aaf40f2c4ef21a52257af42a3;hp=3c22b663eeb8ef5d74e24b165dd694632ac809c8;hb=84fc760439e82e6b3616abd0d1f9bd7d7eb01ec0;hpb=1997858e90da728287ef26a6d01a5766ac914312 diff --git a/daemon/scrub.c b/daemon/scrub.c index 3c22b66..15c8b6c 100644 --- a/daemon/scrub.c +++ b/daemon/scrub.c @@ -28,13 +28,11 @@ #include "actions.h" int -do_scrub_device (char *device) +do_scrub_device (const char *device) { char *err; int r; - RESOLVE_DEVICE (device, return -1); - r = command (NULL, &err, "scrub", device, NULL); if (r == -1) { reply_with_error ("scrub_device: %s: %s", device, err); @@ -48,15 +46,12 @@ do_scrub_device (char *device) } int -do_scrub_file (char *file) +do_scrub_file (const char *file) { char *buf; char *err; int r; - NEED_ROOT (-1); - ABS_PATH (file, -1); - /* Make the path relative to /sysroot. */ buf = sysroot_path (file); if (!buf) { @@ -78,15 +73,12 @@ do_scrub_file (char *file) } int -do_scrub_freespace (char *dir) +do_scrub_freespace (const char *dir) { char *buf; char *err; int r; - NEED_ROOT (-1); - ABS_PATH (dir, -1); - /* Make the path relative to /sysroot. */ buf = sysroot_path (dir); if (!buf) {