X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fblockdev.c;h=0745007aa1f54da8bdf37ab58de61ef70ba42082;hb=1f0810eb3a98cbfd347af59b6b9bc624ddff6028;hp=094ad5e6fac8ec927ed5e420e92348d7092973be;hpb=e038597ebd1e43c83a8ddde21c4f1898eb7a9a98;p=libguestfs.git diff --git a/daemon/blockdev.c b/daemon/blockdev.c index 094ad5e..0745007 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 @@ -32,7 +32,7 @@ * we centralize it in one call. */ static int64_t -call_blockdev (const char *device, const char *switc, int extraarg, int prints) +call_blockdev (const char *device, char *switc, int extraarg, int prints) { int r; int64_t rv; @@ -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; @@ -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; }