Merge pull request #103 from tmobile/tmo-Fix-selitem-warning

jtbaumann · web-flow · commit 69b8db2178ed · 2023-02-10T17:48:12.000-07:00
Fix warnings in tmo-shell
diff --git a/samples/tmo_shell/src/tmo_shell.c b/samples/tmo_shell/src/tmo_shell.c
@@ -160,7 +160,7 @@ int tcp_create_core(const struct shell *shell, size_t argc, char **argv, int fam
 {
 	if (argc < 2){
 		shell_error(shell, "Missing required arguments");
-		z_shell_help_subcmd_print_selitem(shell);
+		shell_help(shell);
 		return -EINVAL;
 	}
 	int idx = strtol(argv[1], NULL, 10);
@@ -211,7 +211,7 @@ int tcp_create_tls_core(const struct shell *shell, size_t argc, char **argv, int
 
 	if (argc < 2){
 		shell_error(shell, "Missing required arguments");
-		z_shell_help_subcmd_print_selitem(shell);
+		shell_help(shell);
 		return -EINVAL;
 	}
 
@@ -282,7 +282,7 @@ int udp_create_core(const struct shell *shell, size_t argc, char **argv, int fam
 {
 	if (argc < 2){
 		shell_error(shell, "Missing required arguments");
-		z_shell_help_subcmd_print_selitem(shell);
+		shell_help(shell);
 		return -EINVAL;
 	}
 	int idx = strtol(argv[1], NULL, 10);
@@ -336,7 +336,7 @@ int udp_create_dtls_core(const struct shell *shell, size_t argc, char **argv, in
 	int ret = 0;
 	if (argc < 2){
 		shell_error(shell, "Missing required arguments");
-		z_shell_help_subcmd_print_selitem(shell);
+		shell_help(shell);
 		return -EINVAL;
 	}
 
@@ -551,7 +551,7 @@ int sock_connect(const struct shell *shell, size_t argc, char **argv)
 {
 	if (argc < 4){
 		shell_error(shell, "Missing required arguments");
-		z_shell_help_subcmd_print_selitem(shell);
+		shell_help(shell);
 		return -EINVAL;
 	}
 	int ret;
@@ -679,7 +679,7 @@ int sock_bind(const struct shell *shell, size_t argc, char **argv)
 {
 	if (argc < 4){
 		shell_error(shell, "Missing required arguments");
-		z_shell_help_subcmd_print_selitem(shell);
+		shell_help(shell);
 		return -EINVAL;
 	}
 	int sd = strtol(argv[1], NULL, 10);
@@ -711,7 +711,7 @@ int sock_send(const struct shell *shell, size_t argc, char **argv)
 {
 	if (argc < 3){
 		shell_error(shell, "Missing required arguments");
-		z_shell_help_subcmd_print_selitem(shell);
+		shell_help(shell);
 		return -EINVAL;
 	}
 
@@ -742,7 +742,7 @@ int sock_sendto(const struct shell *shell, size_t argc, char **argv)
 {
 	if (argc < 5){
 		shell_error(shell, "Missing required arguments");
-		z_shell_help_subcmd_print_selitem(shell);
+		shell_help(shell);
 		return -EINVAL;
 	}
 
@@ -831,7 +831,7 @@ int sock_sendb(const struct shell *shell, size_t argc, char **argv)
 {
 	if (argc < 3){
 		shell_error(shell, "Missing required arguments");
-		z_shell_help_subcmd_print_selitem(shell);
+		shell_help(shell);
 		return -EINVAL;
 	}
 
@@ -920,7 +920,7 @@ int sock_recvb(const struct shell *shell, size_t argc, char **argv)
 {
 	if (argc < 3){
 		shell_error(shell, "Missing required arguments");
-		z_shell_help_subcmd_print_selitem(shell);
+		shell_help(shell);
 		return -EINVAL;
 	}
 
@@ -973,7 +973,7 @@ int sock_rcv(const struct shell *shell, size_t argc, char **argv)
 {
 	if (argc < 2){
 		shell_error(shell, "Missing required arguments");
-		z_shell_help_subcmd_print_selitem(shell);
+		shell_help(shell);
 		return -EINVAL;
 	}
 	int sd = (int)strtol(argv[1], NULL, 10);
@@ -1017,7 +1017,7 @@ int sock_rcvfrom(const struct shell *shell, size_t argc, char **argv)
 {
 	if (argc < 2){
 		shell_error(shell, "Missing required arguments");
-		z_shell_help_subcmd_print_selitem(shell);
+		shell_help(shell);
 		return -EINVAL;
 	}
 	int sd = (int)strtol(argv[1], NULL, 10);
@@ -1068,7 +1068,7 @@ int sock_close(const struct shell *shell, size_t argc, char **argv)
 {
 	if (argc < 2){
 		shell_error(shell, "Missing required arguments");
-		z_shell_help_subcmd_print_selitem(shell);
+		shell_help(shell);
 		return -EINVAL;
 	}
 	int sd = strtol(argv[1], NULL, 10);
@@ -1103,7 +1103,7 @@ int sock_sendsms(const struct shell *shell, size_t argc, char **argv)
 
 	if (argc != 4){
 		shell_error(shell, "Missing required arguments");
-		z_shell_help_subcmd_print_selitem(shell);
+		shell_help(shell);
 		return -EINVAL;
 	}
 
@@ -1134,7 +1134,7 @@ int sock_recvsms(const struct shell *shell, size_t argc, char **argv)
 
 	if (argc != 3){
 		shell_error(shell, "Missing required arguments");
-		z_shell_help_subcmd_print_selitem(shell);
+		shell_help(shell);
 		return -EINVAL;
 	}
 
@@ -1492,7 +1492,7 @@ int cmd_http(const struct shell *shell, size_t argc, char **argv)
 		shell_error(shell, "Missing required argument");
 		shell_print(shell, "Usage: tmo http <devid> <URL> <file (optional)>\n"
 				"       devid: 1 for modem, 2 for wifi\n");
-		z_shell_help_subcmd_print_selitem(shell);
+		shell_help(shell);
 		return -EINVAL;
 	}
 
@@ -1744,7 +1744,7 @@ int cmd_dfu_set_iface(const struct shell *shell, size_t argc, char **argv)
 {
 	if (argc < 2){
 		shell_error(shell, "Missing required arguments");
-		z_shell_help_subcmd_print_selitem(shell);
+		shell_help(shell);
 		return -EINVAL;
 	}
 	int idx = strtol(argv[1], NULL, 10);
@@ -2309,7 +2309,7 @@ int cmd_json_set_iface(const struct shell *shell, size_t argc, char **argv)
 {
 	if (argc < 2) {
 		shell_error(shell, "Missing required arguments");
-		z_shell_help_subcmd_print_selitem(shell);
+		shell_help(shell);
 		return -EINVAL;
 	}
 	int idx = strtol(argv[1], NULL, 10);
@@ -2326,7 +2326,7 @@ int cmd_json_transmit_interval(const struct shell *shell, size_t argc, char **ar
 {
 	if (argc < 2) {
 		shell_error(shell, "Missing required arguments");
-		z_shell_help_subcmd_print_selitem(shell);
+		shell_help(shell);
 		return -EINVAL;
 	}
 	int secs = strtol(argv[1], NULL, 10);
diff --git a/samples/tmo_shell/src/tmo_wifi.c b/samples/tmo_shell/src/tmo_wifi.c
@@ -284,7 +284,7 @@ int cmd_wifi_connect(const struct shell *shell, size_t argc,
 
 	if (argc < 2){
 		shell_error(shell, "Missing required arguments");
-		z_shell_help_subcmd_print_selitem(shell);
+		shell_help(shell);
 		return -EINVAL;
 	}
 	int idx = strtol(argv[1], NULL, 10);
@@ -333,7 +333,7 @@ int cmd_wifi_disconnect(const struct shell *shell, size_t argc,
 {
 	if (argc < 2){
 		shell_error(shell, "Missing required arguments");
-		z_shell_help_subcmd_print_selitem(shell);
+		shell_help(shell);
 		return -EINVAL;
 	}
 	int idx = strtol(argv[1], NULL, 10);
@@ -384,7 +384,7 @@ int cmd_wifi_scan(const struct shell *shell, size_t argc, char *argv[])
 	// struct net_if *iface = net_if_get_default();
 	if (argc < 2){
 		shell_error(shell, "Missing required arguments");
-		z_shell_help_subcmd_print_selitem(shell);
+		shell_help(shell);
 		return -EINVAL;
 	}
 	int idx = strtol(argv[1], NULL, 10);
@@ -423,7 +423,7 @@ int cmd_wifi_status(const struct shell *shell, size_t argc, char *argv[])
 	// struct net_if *iface = net_if_get_default();
 	if (argc < 2){
 		shell_error(shell, "Missing required arguments");
-		z_shell_help_subcmd_print_selitem(shell);
+		shell_help(shell);
 		return -EINVAL;
 	}
 	int idx = strtol(argv[1], NULL, 10);
@@ -512,7 +512,7 @@ int cmd_wifi_mac(const struct shell *shell, size_t argc, char *argv[])
 	// struct net_if *iface = net_if_get_default();
 	if (argc < 2){
 		shell_error(shell, "Missing required arguments");
-		z_shell_help_subcmd_print_selitem(shell);
+		shell_help(shell);
 		return -EINVAL;
 	}
 	int idx = strtol(argv[1], NULL, 10);

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ int tcp_create_core(const struct shell shell, size_t argc, char *argv, int fam`
`160`	`160`	`{`
`161`	`161`	`if (argc < 2){`
`162`	`162`	`shell_error(shell, "Missing required arguments");`
`163`		`- z_shell_help_subcmd_print_selitem(shell);`
	`163`	`+ shell_help(shell);`
`164`	`164`	`return -EINVAL;`
`165`	`165`	`}`
`166`	`166`	`int idx = strtol(argv[1], NULL, 10);`
`@@ -211,7 +211,7 @@ int tcp_create_tls_core(const struct shell shell, size_t argc, char *argv, int`
`211`	`211`
`212`	`212`	`if (argc < 2){`
`213`	`213`	`shell_error(shell, "Missing required arguments");`
`214`		`- z_shell_help_subcmd_print_selitem(shell);`
	`214`	`+ shell_help(shell);`
`215`	`215`	`return -EINVAL;`
`216`	`216`	`}`
`217`	`217`
`@@ -282,7 +282,7 @@ int udp_create_core(const struct shell shell, size_t argc, char *argv, int fam`
`282`	`282`	`{`
`283`	`283`	`if (argc < 2){`
`284`	`284`	`shell_error(shell, "Missing required arguments");`
`285`		`- z_shell_help_subcmd_print_selitem(shell);`
	`285`	`+ shell_help(shell);`
`286`	`286`	`return -EINVAL;`
`287`	`287`	`}`
`288`	`288`	`int idx = strtol(argv[1], NULL, 10);`
`@@ -336,7 +336,7 @@ int udp_create_dtls_core(const struct shell shell, size_t argc, char *argv, in`
`336`	`336`	`int ret = 0;`
`337`	`337`	`if (argc < 2){`
`338`	`338`	`shell_error(shell, "Missing required arguments");`
`339`		`- z_shell_help_subcmd_print_selitem(shell);`
	`339`	`+ shell_help(shell);`
`340`	`340`	`return -EINVAL;`
`341`	`341`	`}`
`342`	`342`
`@@ -551,7 +551,7 @@ int sock_connect(const struct shell shell, size_t argc, char *argv)`
`551`	`551`	`{`
`552`	`552`	`if (argc < 4){`
`553`	`553`	`shell_error(shell, "Missing required arguments");`
`554`		`- z_shell_help_subcmd_print_selitem(shell);`
	`554`	`+ shell_help(shell);`
`555`	`555`	`return -EINVAL;`
`556`	`556`	`}`
`557`	`557`	`int ret;`
`@@ -679,7 +679,7 @@ int sock_bind(const struct shell shell, size_t argc, char *argv)`
`679`	`679`	`{`
`680`	`680`	`if (argc < 4){`
`681`	`681`	`shell_error(shell, "Missing required arguments");`
`682`		`- z_shell_help_subcmd_print_selitem(shell);`
	`682`	`+ shell_help(shell);`
`683`	`683`	`return -EINVAL;`
`684`	`684`	`}`
`685`	`685`	`int sd = strtol(argv[1], NULL, 10);`
`@@ -711,7 +711,7 @@ int sock_send(const struct shell shell, size_t argc, char *argv)`
`711`	`711`	`{`
`712`	`712`	`if (argc < 3){`
`713`	`713`	`shell_error(shell, "Missing required arguments");`
`714`		`- z_shell_help_subcmd_print_selitem(shell);`
	`714`	`+ shell_help(shell);`
`715`	`715`	`return -EINVAL;`
`716`	`716`	`}`
`717`	`717`
`@@ -742,7 +742,7 @@ int sock_sendto(const struct shell shell, size_t argc, char *argv)`
`742`	`742`	`{`
`743`	`743`	`if (argc < 5){`
`744`	`744`	`shell_error(shell, "Missing required arguments");`
`745`		`- z_shell_help_subcmd_print_selitem(shell);`
	`745`	`+ shell_help(shell);`
`746`	`746`	`return -EINVAL;`
`747`	`747`	`}`
`748`	`748`
`@@ -831,7 +831,7 @@ int sock_sendb(const struct shell shell, size_t argc, char *argv)`
`831`	`831`	`{`
`832`	`832`	`if (argc < 3){`
`833`	`833`	`shell_error(shell, "Missing required arguments");`
`834`		`- z_shell_help_subcmd_print_selitem(shell);`
	`834`	`+ shell_help(shell);`
`835`	`835`	`return -EINVAL;`
`836`	`836`	`}`
`837`	`837`
`@@ -920,7 +920,7 @@ int sock_recvb(const struct shell shell, size_t argc, char *argv)`
`920`	`920`	`{`
`921`	`921`	`if (argc < 3){`
`922`	`922`	`shell_error(shell, "Missing required arguments");`
`923`		`- z_shell_help_subcmd_print_selitem(shell);`
	`923`	`+ shell_help(shell);`
`924`	`924`	`return -EINVAL;`
`925`	`925`	`}`
`926`	`926`
`@@ -973,7 +973,7 @@ int sock_rcv(const struct shell shell, size_t argc, char *argv)`
`973`	`973`	`{`
`974`	`974`	`if (argc < 2){`
`975`	`975`	`shell_error(shell, "Missing required arguments");`
`976`		`- z_shell_help_subcmd_print_selitem(shell);`
	`976`	`+ shell_help(shell);`
`977`	`977`	`return -EINVAL;`
`978`	`978`	`}`
`979`	`979`	`int sd = (int)strtol(argv[1], NULL, 10);`
`@@ -1017,7 +1017,7 @@ int sock_rcvfrom(const struct shell shell, size_t argc, char *argv)`
`1017`	`1017`	`{`
`1018`	`1018`	`if (argc < 2){`
`1019`	`1019`	`shell_error(shell, "Missing required arguments");`
`1020`		`- z_shell_help_subcmd_print_selitem(shell);`
	`1020`	`+ shell_help(shell);`
`1021`	`1021`	`return -EINVAL;`
`1022`	`1022`	`}`
`1023`	`1023`	`int sd = (int)strtol(argv[1], NULL, 10);`
`@@ -1068,7 +1068,7 @@ int sock_close(const struct shell shell, size_t argc, char *argv)`
`1068`	`1068`	`{`
`1069`	`1069`	`if (argc < 2){`
`1070`	`1070`	`shell_error(shell, "Missing required arguments");`
`1071`		`- z_shell_help_subcmd_print_selitem(shell);`
	`1071`	`+ shell_help(shell);`
`1072`	`1072`	`return -EINVAL;`
`1073`	`1073`	`}`
`1074`	`1074`	`int sd = strtol(argv[1], NULL, 10);`
`@@ -1103,7 +1103,7 @@ int sock_sendsms(const struct shell shell, size_t argc, char *argv)`
`1103`	`1103`
`1104`	`1104`	`if (argc != 4){`
`1105`	`1105`	`shell_error(shell, "Missing required arguments");`
`1106`		`- z_shell_help_subcmd_print_selitem(shell);`
	`1106`	`+ shell_help(shell);`
`1107`	`1107`	`return -EINVAL;`
`1108`	`1108`	`}`
`1109`	`1109`
`@@ -1134,7 +1134,7 @@ int sock_recvsms(const struct shell shell, size_t argc, char *argv)`
`1134`	`1134`
`1135`	`1135`	`if (argc != 3){`
`1136`	`1136`	`shell_error(shell, "Missing required arguments");`
`1137`		`- z_shell_help_subcmd_print_selitem(shell);`
	`1137`	`+ shell_help(shell);`
`1138`	`1138`	`return -EINVAL;`
`1139`	`1139`	`}`
`1140`	`1140`
`@@ -1492,7 +1492,7 @@ int cmd_http(const struct shell shell, size_t argc, char *argv)`
`1492`	`1492`	`shell_error(shell, "Missing required argument");`
`1493`	`1493`	`shell_print(shell, "Usage: tmo http <devid> <URL> <file (optional)>\n"`
`1494`	`1494`	`" devid: 1 for modem, 2 for wifi\n");`
`1495`		`- z_shell_help_subcmd_print_selitem(shell);`
	`1495`	`+ shell_help(shell);`
`1496`	`1496`	`return -EINVAL;`
`1497`	`1497`	`}`
`1498`	`1498`
`@@ -1744,7 +1744,7 @@ int cmd_dfu_set_iface(const struct shell shell, size_t argc, char *argv)`
`1744`	`1744`	`{`
`1745`	`1745`	`if (argc < 2){`
`1746`	`1746`	`shell_error(shell, "Missing required arguments");`
`1747`		`- z_shell_help_subcmd_print_selitem(shell);`
	`1747`	`+ shell_help(shell);`
`1748`	`1748`	`return -EINVAL;`
`1749`	`1749`	`}`
`1750`	`1750`	`int idx = strtol(argv[1], NULL, 10);`
`@@ -2309,7 +2309,7 @@ int cmd_json_set_iface(const struct shell shell, size_t argc, char *argv)`
`2309`	`2309`	`{`
`2310`	`2310`	`if (argc < 2) {`
`2311`	`2311`	`shell_error(shell, "Missing required arguments");`
`2312`		`- z_shell_help_subcmd_print_selitem(shell);`
	`2312`	`+ shell_help(shell);`
`2313`	`2313`	`return -EINVAL;`
`2314`	`2314`	`}`
`2315`	`2315`	`int idx = strtol(argv[1], NULL, 10);`
`@@ -2326,7 +2326,7 @@ int cmd_json_transmit_interval(const struct shell shell, size_t argc, char *ar`
`2326`	`2326`	`{`
`2327`	`2327`	`if (argc < 2) {`
`2328`	`2328`	`shell_error(shell, "Missing required arguments");`
`2329`		`- z_shell_help_subcmd_print_selitem(shell);`
	`2329`	`+ shell_help(shell);`
`2330`	`2330`	`return -EINVAL;`
`2331`	`2331`	`}`
`2332`	`2332`	`int secs = strtol(argv[1], NULL, 10);`