X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fblockdev.c;h=35d14bf8523187cee8a1622fa8306bd0bd887745;hp=094ad5e6fac8ec927ed5e420e92348d7092973be;hb=0f2e9c84e9ff1071260770930068642ecc8ac0d9;hpb=e038597ebd1e43c83a8ddde21c4f1898eb7a9a98 diff --git a/daemon/blockdev.c b/daemon/blockdev.c index 094ad5e..35d14bf 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 (char *device, char *switc, int extraarg, int prints) { int r; int64_t rv; @@ -68,7 +68,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; } @@ -80,37 +80,37 @@ call_blockdev (const char *device, const char *switc, int extraarg, int prints) } int -do_blockdev_setro (const char *device) +do_blockdev_setro (char *device) { return (int) call_blockdev (device, "--setro", 0, 0); } int -do_blockdev_setrw (const char *device) +do_blockdev_setrw (char *device) { return (int) call_blockdev (device, "--setrw", 0, 0); } int -do_blockdev_getro (const char *device) +do_blockdev_getro (char *device) { return (int) call_blockdev (device, "--getro", 0, 1); } int -do_blockdev_getss (const char *device) +do_blockdev_getss (char *device) { return (int) call_blockdev (device, "--getss", 0, 1); } int -do_blockdev_getbsz (const char *device) +do_blockdev_getbsz (char *device) { return (int) call_blockdev (device, "--getbsz", 0, 1); } int -do_blockdev_setbsz (const char *device, int blocksize) +do_blockdev_setbsz (char *device, int blocksize) { if (blocksize <= 0 /* || blocksize >= what? */) { reply_with_error ("blockdev_setbsz: blocksize must be > 0"); @@ -120,25 +120,25 @@ do_blockdev_setbsz (const char *device, int blocksize) } int64_t -do_blockdev_getsz (const char *device) +do_blockdev_getsz (char *device) { return call_blockdev (device, "--getsz", 0, 1); } int64_t -do_blockdev_getsize64 (const char *device) +do_blockdev_getsize64 (char *device) { return call_blockdev (device, "--getsize64", 0, 1); } int -do_blockdev_flushbufs (const char *device) +do_blockdev_flushbufs (char *device) { return call_blockdev (device, "--flushbufs", 0, 0); } int -do_blockdev_rereadpt (const char *device) +do_blockdev_rereadpt (char *device) { return call_blockdev (device, "--rereadpt", 0, 0); }