git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 'unknown filesystem' warnings in old inspection code (RHBZ#678231 RHBZ#666578).
[libguestfs.git]
/
daemon
/
blockdev.c
diff --git
a/daemon/blockdev.c
b/daemon/blockdev.c
index
1aa6eaa
..
1afb4b8
100644
(file)
--- a/
daemon/blockdev.c
+++ b/
daemon/blockdev.c
@@
-38,7
+38,7
@@
call_blockdev (const char *device, const char *switc, int extraarg, int prints)
int64_t rv;
char *out, *err;
const char *argv[] = {
int64_t rv;
char *out, *err;
const char *argv[] = {
- "
/sbin/
blockdev",
+ "blockdev",
switc,
NULL,
NULL,
switc,
NULL,
NULL,
@@
-53,7
+53,7
@@
call_blockdev (const char *device, const char *switc, int extraarg, int prints)
} else
argv[2] = device;
} else
argv[2] = device;
- r = commandv (&out, &err,
(char **)
argv);
+ r = commandv (&out, &err, argv);
if (r == -1) {
reply_with_error ("%s: %s", argv[0], err);
if (r == -1) {
reply_with_error ("%s: %s", argv[0], err);
@@
-68,11
+68,13
@@
call_blockdev (const char *device, const char *switc, int extraarg, int prints)
if (sscanf (out, "%" SCNi64, &rv) != 1) {
reply_with_error ("%s: expected output, but got nothing", argv[0]);
free (out);
if (sscanf (out, "%" SCNi64, &rv) != 1) {
reply_with_error ("%s: expected output, but got nothing", argv[0]);
free (out);
+ free (err);
return -1;
}
}
free (out);
return -1;
}
}
free (out);
+ free (err);
return rv;
}
return rv;
}
@@
-111,7
+113,7
@@
int
do_blockdev_setbsz (const char *device, int blocksize)
{
if (blocksize <= 0 /* || blocksize >= what? */) {
do_blockdev_setbsz (const char *device, int blocksize)
{
if (blocksize <= 0 /* || blocksize >= what? */) {
- reply_with_error ("block
dev_setbsz: block
size must be > 0");
+ reply_with_error ("blocksize must be > 0");
return -1;
}
return (int) call_blockdev (device, "--setbsz", blocksize, 0);
return -1;
}
return (int) call_blockdev (device, "--setbsz", blocksize, 0);