git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
virt-alignment-scan: Add checks for when API calls return NULL.
[libguestfs.git]
/
daemon
/
blockdev.c
diff --git
a/daemon/blockdev.c
b/daemon/blockdev.c
index
2c075ef
..
d056abe
100644
(file)
--- a/
daemon/blockdev.c
+++ b/
daemon/blockdev.c
@@
-1,5
+1,5
@@
/* libguestfs - the guestfsd daemon
/* 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
*
* 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
@@
-13,7
+13,7
@@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc.,
675 Mass Ave, Cambridge, MA 02139,
USA.
+ * Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA.
*/
#include <config.h>
*/
#include <config.h>
@@
-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,
@@
-46,8
+46,6
@@
call_blockdev (const char *device, const char *switc, int extraarg, int prints)
};
char buf[64];
};
char buf[64];
- IS_DEVICE (device, -1);
-
if (extraarg > 0) {
snprintf (buf, sizeof buf, "%d", extraarg);
argv[2] = buf;
if (extraarg > 0) {
snprintf (buf, sizeof buf, "%d", extraarg);
argv[2] = buf;
@@
-70,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;
}
@@
-113,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);