X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fblockdev.c;h=1aa6eaa20afa18c0b7ab55de8e5a9901f23c52d1;hb=9c5f05ec14655195fc94dc7c72d132087abe634b;hp=094ad5e6fac8ec927ed5e420e92348d7092973be;hpb=e038597ebd1e43c83a8ddde21c4f1898eb7a9a98;p=libguestfs.git

diff --git a/daemon/blockdev.c b/daemon/blockdev.c
index 094ad5e..1aa6eaa 100644
--- 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
@@ -46,8 +46,6 @@ call_blockdev (const char *device, const 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 (const char *device, const 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);
@@ -68,7 +66,7 @@ call_blockdev (const char *device, const char *switc, int extraarg, int prints)
 
   if (prints) {
     if (sscanf (out, "%" SCNi64, &rv) != 1) {
-      reply_with_error ("%s: expected output, but got nothing");
+      reply_with_error ("%s: expected output, but got nothing", argv[0]);
       free (out);
       return -1;
     }