build: quiet LLVM non-literal string format warning

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

diff --git a/debugfs/extent_inode.c b/debugfs/extent_inode.c
index 11c4b4f..75e328c 100644 (file)
--- a/debugfs/extent_inode.c
+++ b/debugfs/extent_inode.c
@@ -264,7 +264,7 @@ 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], &extent.e_lblk);
        if (err)
                return;
 
@@ -272,7 +272,7 @@ void do_replace_node(int argc, char *argv[])
        if (err)
                return;
 
-       extent.e_pblk = parse_ulong(argv[3], argv[0], "logical block", &err);
+       err = strtoblk(argv[0], argv[3], &extent.e_pblk);
        if (err)
                return;
 
@@ -281,7 +281,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 +297,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,8 +338,7 @@ 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], &extent.e_lblk);
        if (err)
                return;
 
@@ -348,8 +347,7 @@ void do_insert_node(int argc, char *argv[])
        if (err)
                return;
 
-       extent.e_pblk = parse_ulong(argv[3], cmd,
-                                   "pysical block", &err);
+       err = strtoblk(cmd, argv[3], &extent.e_pblk);
        if (err)
                return;
 
@@ -358,7 +356,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 +364,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 +385,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);
        if (err)
                return;
 
-       physical = parse_ulong(argv[2], cmd,
-                                   "physical block", &err);
+       err = strtoblk(cmd, argv[2], &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;