ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/app: Improve error check of input parsing by spdk_strtol

Browse Source 
Change-Id: I7da74760a7cd099c512b966c87e05a4a7084b360
Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/c/441644
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: wuzhouhui <wuzhouhui@kingsoft.com>
This commit is contained in:
Shuhei Matsumoto 2019-01-23 11:27:13 +09:00 committed by Darek Stojaczyk
parent b252a13a90
commit f56de7b8cf
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
test/app/stub/stub.c
View File

@ -35,6 +35,7 @@
#include "spdk/event.h" #include "spdk/event.h"
#include "spdk/nvme.h" #include "spdk/nvme.h"
#include "spdk/string.h"
static char g_path[256]; static char g_path[256];
@ -100,6 +101,7 @@ main(int argc, char **argv)
{ {
int ch; int ch;
struct spdk_app_opts opts = {}; struct spdk_app_opts opts = {};
long int val;
/* default value in opts structure */ /* default value in opts structure */
spdk_app_opts_init(&opts); spdk_app_opts_init(&opts);
@ -108,26 +110,35 @@ main(int argc, char **argv)
opts.rpc_addr = NULL; opts.rpc_addr = NULL;
while ((ch = getopt(argc, argv, "i:m:n:p:s:H")) != -1) { while ((ch = getopt(argc, argv, "i:m:n:p:s:H")) != -1) {
switch (ch) { if (ch == 'm') {
case 'i':
opts.shm_id = atoi(optarg);
break;
case 'm':
opts.reactor_mask = optarg; opts.reactor_mask = optarg;
break; } else if (ch == '?') {
case 'n':
opts.mem_channel = atoi(optarg);
break;
case 'p':
opts.master_core = atoi(optarg);
break;
case 's':
opts.mem_size = atoi(optarg);
break;
case 'H':
default:
usage(argv[0]); usage(argv[0]);
exit(EXIT_SUCCESS); exit(1);
} else {
val = spdk_strtol(optarg, 10);
if (val < 0) {
fprintf(stderr, "Converting a string to integer failed\n");
exit(1);
}
switch (ch) {
case 'i':
opts.shm_id = val;
break;
case 'n':
opts.mem_channel = val;
break;
case 'p':
opts.master_core = val;
break;
case 's':
opts.mem_size = val;
break;
case 'H':
default:
usage(argv[0]);
exit(EXIT_SUCCESS);
}
} }
} }