git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fish: Improve error messages when no OS / multi-boot OS found with inspection (RHBZ...
[libguestfs.git]
/
daemon
/
blockdev.c
diff --git
a/daemon/blockdev.c
b/daemon/blockdev.c
index
3df1807
..
d056abe
100644
(file)
--- a/
daemon/blockdev.c
+++ b/
daemon/blockdev.c
@@
-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>
@@
-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;
}