btrfs-progs: return errors from parse_tree_id

Parsing functions should not call exit, so convert parse_tree_id() to
return error and take the output parameter instead.

Signed-off-by: David Sterba <[email protected]>

Author: kdave

cmds/inspect-dump-tree.c

@@ -344,7 +344,11 @@ static int cmd_inspect_dump_tree(const struct cmd_struct *cmd,
 				goto out;
 			break;
 		case 't':
-			tree_id = parse_tree_id(optarg);
+			ret = parse_tree_id(optarg, &tree_id);
+			if (ret < 0) {
+				error("cannot parse tree id: %s");
+				return 1;
+			}
 			break;
 		case GETOPT_VAL_FOLLOW:
 			follow = BTRFS_PRINT_TREE_FOLLOW;

cmds/inspect-tree-stats.c

@@ -468,7 +468,11 @@ static int cmd_inspect_tree_stats(const struct cmd_struct *cmd,
 			unit_mode = UNITS_RAW;
 			break;
 		case 't':
-			tree_id = parse_tree_id(optarg);
+			ret = parse_tree_id(optarg, &tree_id);
+			if (ret < 0) {
+				error("cannot parse tree id: %s");
+				return 1;
+			}
 			break;
 		default:
 			usage_unknown_option(cmd, argv);

common/parse-utils.c

@@ -457,24 +457,21 @@ static u64 tree_id_from_string(const char *str, const char **end)
 	return id;
 }
 
-u64 parse_tree_id(const char* str) {
-	u64 tree_id = 0;
+int parse_tree_id(const char* str, u64 *tree_id) {
 	const char *end = NULL;
 
 	if (string_is_numerical(str))
-		tree_id = arg_strtou64(str);
+		*tree_id = arg_strtou64(str);
 	else
-		tree_id = tree_id_from_string(str, &end);
+		*tree_id = tree_id_from_string(str, &end);
 
-	if (!tree_id) {
-		error("unrecognized tree id: %s", str);
-		exit(1);
-	}
+	if (*tree_id == 0)
+		return -EINVAL;
 
 	if (end && *end) {
 		error("unexpected tree id suffix of '%s': %s", str, end);
-		exit(1);
+		return -EINVAL;
 	}
 
-	return tree_id;
+	return 0;
 }

common/parse-utils.h

@@ -30,7 +30,7 @@ int parse_bg_profile(const char *profile, u64 *flags);
 int parse_compress_type(const char *type);
 int parse_qgroupid(const char *str, u64 *qgroupid);
 u64 parse_qgroupid_or_path(const char *p);
-u64 parse_tree_id(const char* str);
+int parse_tree_id(const char* str, u64 *tree_id);
 int fls64(u64 x);
 
 #endif