mke2fs: Use e4fsprogs programs if available.

[libguestfs.git] / daemon / blockdev.c

diff --git a/daemon/blockdev.c b/daemon/blockdev.c
index 1b0185a..1aa6eaa 100644 (file)
--- a/daemon/blockdev.c
+++ b/daemon/blockdev.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc. 
+ * Copyright (C) 2009 Red Hat Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@
  * we centralize it in one call.
  */
 static int64_t
-call_blockdev (char *device, char *switc, int extraarg, int prints)
+call_blockdev (const char *device, const char *switc, int extraarg, int prints)
 {
   int r;
   int64_t rv;
@@ -46,8 +46,6 @@ call_blockdev (char *device, char *switc, int extraarg, int prints)
   };
   char buf[64];
 
-  IS_DEVICE (device, -1);
-
   if (extraarg > 0) {
     snprintf (buf, sizeof buf, "%d", extraarg);
     argv[2] = buf;
@@ -55,7 +53,7 @@ call_blockdev (char *device, char *switc, int extraarg, int prints)
   } else
     argv[2] = device;
 
-  r = commandv (&out, &err, argv);
+  r = commandv (&out, &err, (char **) argv);
 
   if (r == -1) {
     reply_with_error ("%s: %s", argv[0], err);
@@ -80,37 +78,37 @@ call_blockdev (char *device, char *switc, int extraarg, int prints)
 }
 
 int
-do_blockdev_setro (char *device)
+do_blockdev_setro (const char *device)
 {
   return (int) call_blockdev (device, "--setro", 0, 0);
 }
 
 int
-do_blockdev_setrw (char *device)
+do_blockdev_setrw (const char *device)
 {
   return (int) call_blockdev (device, "--setrw", 0, 0);
 }
 
 int
-do_blockdev_getro (char *device)
+do_blockdev_getro (const char *device)
 {
   return (int) call_blockdev (device, "--getro", 0, 1);
 }
 
 int
-do_blockdev_getss (char *device)
+do_blockdev_getss (const char *device)
 {
   return (int) call_blockdev (device, "--getss", 0, 1);
 }
 
 int
-do_blockdev_getbsz (char *device)
+do_blockdev_getbsz (const char *device)
 {
   return (int) call_blockdev (device, "--getbsz", 0, 1);
 }
 
 int
-do_blockdev_setbsz (char *device, int blocksize)
+do_blockdev_setbsz (const char *device, int blocksize)
 {
   if (blocksize <= 0 /* || blocksize >= what? */) {
     reply_with_error ("blockdev_setbsz: blocksize must be > 0");
@@ -120,25 +118,25 @@ do_blockdev_setbsz (char *device, int blocksize)
 }
 
 int64_t
-do_blockdev_getsz (char *device)
+do_blockdev_getsz (const char *device)
 {
   return call_blockdev (device, "--getsz", 0, 1);
 }
 
 int64_t
-do_blockdev_getsize64 (char *device)
+do_blockdev_getsize64 (const char *device)
 {
   return call_blockdev (device, "--getsize64", 0, 1);
 }
 
 int
-do_blockdev_flushbufs (char *device)
+do_blockdev_flushbufs (const char *device)
 {
   return call_blockdev (device, "--flushbufs", 0, 0);
 }
 
 int
-do_blockdev_rereadpt (char *device)
+do_blockdev_rereadpt (const char *device)
 {
   return call_blockdev (device, "--rereadpt", 0, 0);
 }