X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fblockdev.c;h=e0ac350213c921e7d5ed36ee31f77916a3614df3;hb=31053d2027d3db9423edcfc70a725b6ca3a7c84c;hp=2c075ef83dd80bd7c69a7bedf506061ae34e1eed;hpb=170f262f0413de843af62b968f6d12c1c476ae7f;p=libguestfs.git diff --git a/daemon/blockdev.c b/daemon/blockdev.c index 2c075ef..e0ac350 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; @@ -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);