From: Eric Sandeen <sandeen@redhat.com>
Date: Wed, 11 May 2011 16:46:19 +0000 (-0500)
Subject: debugfs: remove unused htree_dump "-l" argument
X-Git-Tag: v1.42-WIP-0702~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ec5d104d7f8ac225a2d8576bfdc668f16acc280;p=thirdparty%2Fe2fsprogs.git

debugfs: remove unused htree_dump "-l" argument

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>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/debugfs/htree.c b/debugfs/htree.c
index 08f9749ef..b829e25ef 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]))