interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve pld command argument parsing.

This commit is contained in:
Zachary T Welch 2009-10-24 01:22:58 -07:00
parent 2b78a4e82b
commit 6e542407e7
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pld/pld.c
View File

@ -175,7 +175,9 @@ static int handle_pld_load_command(struct command_context_s *cmd_ctx,
return ERROR_OK; return ERROR_OK;
} }
p = get_pld_device_by_num(strtoul(args[0], NULL, 0)); unsigned dev_id;
COMMAND_PARSE_NUMBER(uint, args[0], dev_id);
p = get_pld_device_by_num(dev_id);
if (!p) if (!p)
{ {
command_print(cmd_ctx, "pld device '#%s' is out of bounds", args[0]); command_print(cmd_ctx, "pld device '#%s' is out of bounds", args[0]);
@ -184,19 +186,20 @@ static int handle_pld_load_command(struct command_context_s *cmd_ctx,
if ((retval = p->driver->load(p, args[1])) != ERROR_OK) if ((retval = p->driver->load(p, args[1])) != ERROR_OK)
{ {
command_print(cmd_ctx, "failed loading file %s to pld device %lu", command_print(cmd_ctx, "failed loading file %s to pld device %u",
args[1], strtoul(args[0], NULL, 0)); args[1], dev_id);
switch (retval) switch (retval)
{ {
} }
return retval;
} }
else else
{ {
gettimeofday(&end, NULL); gettimeofday(&end, NULL);
timeval_subtract(&duration, &end, &start); timeval_subtract(&duration, &end, &start);
command_print(cmd_ctx, "loaded file %s to pld device %lu in %jis %jius", command_print(cmd_ctx, "loaded file %s to pld device %u in %jis %jius",
args[1], strtoul(args[0], NULL, 0), args[1], dev_id,
(intmax_t)duration.tv_sec, (intmax_t)duration.tv_usec); (intmax_t)duration.tv_sec, (intmax_t)duration.tv_usec);
} }

4
src/pld/virtex2.c
View File

@ -202,7 +202,9 @@ static int virtex2_handle_read_stat_command(struct command_context_s *cmd_ctx,
return ERROR_OK; return ERROR_OK;
} }
device = get_pld_device_by_num(strtoul(args[0], NULL, 0)); unsigned dev_id;
COMMAND_PARSE_NUMBER(uint, args[0], dev_id);
device = get_pld_device_by_num(dev_id);
if (!device) if (!device)
{ {
command_print(cmd_ctx, "pld device '#%s' is out of bounds", args[0]); command_print(cmd_ctx, "pld device '#%s' is out of bounds", args[0]);