daemon: debug segv correct use of dereferencing NULL.

[libguestfs.git] / fish / alloc.c

diff --git a/fish/alloc.c b/fish/alloc.c
index 7533741..08790a7 100644 (file)
--- a/fish/alloc.c
+++ b/fish/alloc.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
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <config.h>
@@ -31,7 +31,7 @@
 #include "fish.h"
 
 int
-do_alloc (const char *cmd, int argc, char *argv[])
+run_alloc (const char *cmd, size_t argc, char *argv[])
 {
   if (argc != 2) {
     fprintf (stderr, _("use 'alloc file size' to create an image\n"));
@@ -45,7 +45,7 @@ do_alloc (const char *cmd, int argc, char *argv[])
 }
 
 int
-do_sparse (const char *cmd, int argc, char *argv[])
+run_sparse (const char *cmd, size_t argc, char *argv[])
 {
   if (argc != 2) {
     fprintf (stderr, _("use 'sparse file size' to create a sparse image\n"));
@@ -58,8 +58,6 @@ do_sparse (const char *cmd, int argc, char *argv[])
   return 0;
 }
 
-static int parse_size (const char *str, off_t *size_rtn);
-
 /* This is the underlying allocation function.  It's called from
  * a few other places in guestfish.
  */
@@ -135,7 +133,9 @@ alloc_disk (const char *filename, const char *size_str, int add, int sparse)
   }
 
   if (add) {
-    if (guestfs_add_drive (g, filename) == -1) {
+    if (guestfs_add_drive_opts (g, filename,
+                                GUESTFS_ADD_DRIVE_OPTS_FORMAT, "raw",
+                                -1) == -1) {
       unlink (filename);
       return -1;
     }
@@ -144,7 +144,7 @@ alloc_disk (const char *filename, const char *size_str, int add, int sparse)
   return 0;
 }
 
-static int
+int
 parse_size (const char *str, off_t *size_rtn)
 {
   unsigned long long size;
@@ -154,7 +154,7 @@ parse_size (const char *str, off_t *size_rtn)
   if (xerr != LONGINT_OK) {
     fprintf (stderr,
              _("%s: invalid integer parameter (%s returned %d)\n"),
-             "alloc_disk", "xstrtoull", xerr);
+             "parse_size", "xstrtoull", xerr);
     return -1;
   }