Patchwork debugfs: remove unused htree_dump "-l" argument

login
register
mail settings
Submitter Eric Sandeen
Date May 11, 2011, 4:46 p.m.
Message ID <4DCABD5B.8040403@redhat.com>
Download mbox | patch
Permalink /patch/95168/
State Accepted
Headers show

Comments

Eric Sandeen - May 11, 2011, 4:46 p.m.
The long_opt / -l argument was apparently never implemented,
so remove it and associated argument parsing.

This slightly changes the (undocumented) behavior because it
no longer defaults to cwd if no filespec is specified...

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---




--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Lukas Czerner - May 12, 2011, 7:43 a.m.
On Wed, 11 May 2011, Eric Sandeen wrote:

> The long_opt / -l argument was apparently never implemented,
> so remove it and associated argument parsing.
> 
> This slightly changes the (undocumented) behavior because it
> no longer defaults to cwd if no filespec is specified...

The patch looks good.

Thanks!
-Lukas

> 
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>
> ---
> 
> diff --git a/debugfs/htree.c b/debugfs/htree.c
> index 08f9749..b829e25 100644
> --- a/debugfs/htree.c
> +++ b/debugfs/htree.c
> @@ -197,8 +197,6 @@ void do_htree_dump(int argc, char *argv[])
>  {
>  	ext2_ino_t	ino;
>  	struct ext2_inode inode;
> -	int		c;
> -	int		long_opt = 0;
>  	blk64_t		blk;
>  	char		*buf = NULL;
>  	struct 		ext2_dx_root_info  *rootnode;
> @@ -211,28 +209,7 @@ void do_htree_dump(int argc, char *argv[])
>  
>  	pager = open_pager();
>  
> -	reset_getopt();
> -	while ((c = getopt (argc, argv, "l")) != EOF) {
> -		switch (c) {
> -		case 'l':
> -			long_opt++;
> -			break;
> -		default:
> -			goto print_usage;
> -		}
> -	}
> -
> -	if (argc > optind+1) {
> -	print_usage:
> -		com_err(0, 0, "Usage: htree_dump [-l] file");
> -		goto errout;
> -	}
> -
> -	if (argc == optind)
> -		ino = cwd;
> -	else
> -		ino = string_to_inode(argv[optind]);
> -	if (!ino)
> +	if (common_inode_args_process(argc, argv, &ino, 0))
>  		goto errout;
>  
>  	if (debugfs_read_inode(ino, &inode, argv[1]))
> 
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Theodore Ts'o - May 15, 2011, 3:39 a.m.
On Wed, May 11, 2011 at 11:46:19AM -0500, Eric Sandeen wrote:
> The long_opt / -l argument was apparently never implemented,
> so remove it and associated argument parsing.
> 
> This slightly changes the (undocumented) behavior because it
> no longer defaults to cwd if no filespec is specified...
> 
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>

Thanks, added to the e2fsprogs "next" branch.

					- Ted
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/debugfs/htree.c b/debugfs/htree.c
index 08f9749..b829e25 100644
--- a/debugfs/htree.c
+++ b/debugfs/htree.c
@@ -197,8 +197,6 @@  void do_htree_dump(int argc, char *argv[])
 {
 	ext2_ino_t	ino;
 	struct ext2_inode inode;
-	int		c;
-	int		long_opt = 0;
 	blk64_t		blk;
 	char		*buf = NULL;
 	struct 		ext2_dx_root_info  *rootnode;
@@ -211,28 +209,7 @@  void do_htree_dump(int argc, char *argv[])
 
 	pager = open_pager();
 
-	reset_getopt();
-	while ((c = getopt (argc, argv, "l")) != EOF) {
-		switch (c) {
-		case 'l':
-			long_opt++;
-			break;
-		default:
-			goto print_usage;
-		}
-	}
-
-	if (argc > optind+1) {
-	print_usage:
-		com_err(0, 0, "Usage: htree_dump [-l] file");
-		goto errout;
-	}
-
-	if (argc == optind)
-		ino = cwd;
-	else
-		ino = string_to_inode(argv[optind]);
-	if (!ino)
+	if (common_inode_args_process(argc, argv, &ino, 0))
 		goto errout;
 
 	if (debugfs_read_inode(ino, &inode, argv[1]))