Skip to contentSkip to conversation

debugfs: remove unused htree_dump "-l" argument

PATCH In review Eric Sandeen 3 participants 3 messages May 11, 2011 – May 15, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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...

---

debugfs/htree.c +0 -18
index 08f9749..b829e25 100644
@@ -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;
-	}
#1 lore raw
Quoted 5 lines · Eric Sandeen

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

Quoted 55 lines

---

debugfs/htree.c +1 -25
index 08f9749..b829e25 100644
@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#2 lore raw
In reply to Eric Sandeen
Quoted 7 lines · Eric Sandeen

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...

Thanks, added to the e2fsprogs "next" branch.

- Ted