mctp-client: use parse_* helpers for argument parsing

We have helpers for EID and net parsing, use those instead of an
explicit stroul(). This means we don't need to carry parse status
outside of individual tag handler blocks.

In doing so, fix a bug where network IDs > 255 are not accepted.

Signed-off-by: Jeremy Kerr <[email protected]>

Author: jk-ozlabs

src/mctp-client.c

@@ -209,13 +209,11 @@ static int find_data(int argc, char **argv)
 
 int main(int argc, char **argv)
 {
-	int ctr, data_idx, net = MCTP_NET_ANY;
+	unsigned int net = MCTP_NET_ANY;
 	bool valid_eid, valid_type;
 	struct data_t send_data;
-	char *tag, *endp, *val;
-	unsigned long int tmp;
+	int type, ctr, data_idx;
 	mctp_eid_t eid;
-	int type;
 
 	data_idx = find_data(argc, argv);
 	if (data_idx < 0) {
@@ -235,33 +233,29 @@ int main(int argc, char **argv)
 	valid_type = false;
 
 	for (ctr = 1; ctr < argc; ctr += 2) {
-		bool valid_parse;
+		char *tag, *val;
+		int rc;
 
 		tag = argv[ctr];
 		val = argv[ctr + 1];
-		tmp = strtoul(val, &endp, 0);
-		valid_parse = endp != val;
+
 		if (!strcmp(tag, "eid")) {
-			if (tmp > 0xff)
+			rc = parse_eid(val, &eid);
+			if (rc)
 				errx(EXIT_FAILURE, "invalid eid: %s", val);
-			eid = tmp;
 			valid_eid = true;
 		} else if (!strcmp(tag, "net")) {
-			if (net > 0xff)
+			rc = parse_uint32(val, &net);
+			if (rc)
 				errx(EXIT_FAILURE, "invalid net: %s", val);
-			net = tmp;
 		} else if (!strcmp(tag, "type")) {
 			type = do_type_lookup(val);
 			if (type < 0 || type > 0xff)
 				errx(EXIT_FAILURE, "invalid type: %s", val);
-
-			valid_parse = true;
 			valid_type = true;
+
 		} else
 			errx(EXIT_FAILURE, "invalid tag: %s", tag);
-
-		if (!valid_parse)
-			errx(EXIT_FAILURE, "invalid argument: %s", val);
 	}
 
 	if (!valid_eid || !valid_type) {