Fix compile error and warnings for old gcc versions

[tools/e2fsprogs.git] / debugfs / extent_inode.c

diff --git a/debugfs/extent_inode.c b/debugfs/extent_inode.c
index 11c4b4f..c7a92a7 100644 (file)
--- a/debugfs/extent_inode.c
+++ b/debugfs/extent_inode.c
@@ -25,8 +25,8 @@ extern char *optarg;
 
 #include "debugfs.h"
 
-ext2_ino_t     current_ino;
-ext2_extent_handle_t current_handle;
+static ext2_ino_t      current_ino;
+static ext2_extent_handle_t current_handle;
 
 static void dbg_print_extent(char *desc, struct ext2fs_extent *extent)
 {
@@ -97,6 +97,11 @@ void do_extent_open(int argc, char *argv[])
 
        orig_prompt = ss_get_prompt(sci_idx);
        extent_prompt = malloc(strlen(orig_prompt) + 32);
+       if (extent_prompt == NULL) {
+               com_err(argv[1], retval, "out of memory");
+               return;
+       }
+
        strcpy(extent_prompt, orig_prompt);
        cp = strchr(extent_prompt, ':');
        if (cp)
@@ -264,15 +269,15 @@ void do_replace_node(int argc, char *argv[])
                return;
        }
 
-       extent.e_lblk = parse_ulong(argv[1], argv[0], "logical block", &err);
+       err = strtoblk(argv[0], argv[1], "logical block", &extent.e_lblk);
        if (err)
                return;
 
-       extent.e_len = parse_ulong(argv[2], argv[0], "logical block", &err);
+       extent.e_len = parse_ulong(argv[2], argv[0], "length", &err);
        if (err)
                return;
 
-       extent.e_pblk = parse_ulong(argv[3], argv[0], "logical block", &err);
+       err = strtoblk(argv[0], argv[3], "physical block", &extent.e_pblk);
        if (err)
                return;
 
@@ -281,7 +286,7 @@ void do_replace_node(int argc, char *argv[])
                com_err(argv[0], retval, 0);
                return;
        }
-       do_current_node(argc, argv);
+       generic_goto_node(NULL, argc, argv, EXT2_EXTENT_CURRENT);
 }
 
 void do_split_node(int argc, char *argv[])
@@ -297,7 +302,7 @@ void do_split_node(int argc, char *argv[])
                com_err(argv[0], retval, 0);
                return;
        }
-       do_current_node(argc, argv);
+       generic_goto_node(NULL, argc, argv, EXT2_EXTENT_CURRENT);
 }
 
 void do_insert_node(int argc, char *argv[])
@@ -338,18 +343,15 @@ void do_insert_node(int argc, char *argv[])
                return;
        }
 
-       extent.e_lblk = parse_ulong(argv[1], cmd,
-                                   "logical block", &err);
+       err = strtoblk(cmd, argv[1], "logical block", &extent.e_lblk);
        if (err)
                return;
 
-       extent.e_len = parse_ulong(argv[2], cmd,
-                                   "length", &err);
+       extent.e_len = parse_ulong(argv[2], cmd, "length", &err);
        if (err)
                return;
 
-       extent.e_pblk = parse_ulong(argv[3], cmd,
-                                   "pysical block", &err);
+       err = strtoblk(cmd, argv[3], "physical block", &extent.e_pblk);
        if (err)
                return;
 
@@ -358,7 +360,7 @@ void do_insert_node(int argc, char *argv[])
                com_err(cmd, retval, 0);
                return;
        }
-       do_current_node(argc, argv);
+       generic_goto_node(NULL, argc, argv, EXT2_EXTENT_CURRENT);
 }
 
 void do_set_bmap(int argc, char **argv)
@@ -366,8 +368,8 @@ void do_set_bmap(int argc, char **argv)
        const char      *usage = "[--uninit] <lblk> <pblk>";
        struct ext2fs_extent extent;
        errcode_t       retval;
-       blk_t           logical;
-       blk_t           physical;
+       blk64_t         logical;
+       blk64_t         physical;
        char            *cmd = argv[0];
        int             flags = 0;
        int             err;
@@ -387,18 +389,16 @@ void do_set_bmap(int argc, char **argv)
                return;
        }
 
-       logical = parse_ulong(argv[1], cmd,
-                                   "logical block", &err);
+       err = strtoblk(cmd, argv[1], "logical block", &logical);
        if (err)
                return;
 
-       physical = parse_ulong(argv[2], cmd,
-                                   "physical block", &err);
+       err = strtoblk(cmd, argv[2], "physical block", &physical);
        if (err)
                return;
 
        retval = ext2fs_extent_set_bmap(current_handle, logical,
-                                       (blk64_t) physical, flags);
+                                       physical, flags);
        if (retval) {
                com_err(cmd, retval, 0);
                return;
@@ -520,7 +520,7 @@ void do_goto_block(int argc, char **argv)
                                       "block [level]", 0))
                return;
 
-       if (strtoblk(argv[0], argv[1], &blk))
+       if (strtoblk(argv[0], argv[1], NULL, &blk))
                return;
 
        if (argc == 3) {