helper/command: change prototype of command_print/command_print_sameline
To prepare for handling TCL return values consistently, all calls to command_print/command_print_sameline should switch to CMD as first parameter. Change prototype of command_print() and command_print_sameline() to pass CMD instead of CMD_CTX. Since the first parameter is currently not used, the change can be done though scripts without manual coding. This patch is created using the command: sed -i PATTERN $(find src/ doc/ -type f) with all the following patters: 's/\(command_print(cmd\)->ctx,/\1,/' 's/\(command_print(CMD\)_CTX,/\1,/' 's/\(command_print(struct command_\)context \*context,/\1invocation *cmd,/' 's/\(command_print_sameline(cmd\)->ctx,/\1,/' 's/\(command_print_sameline(CMD\)_CTX,/\1,/' 's/\(command_print_sameline(struct command_\)context \*context,/\1invocation *cmd,/' This change is inspired by http://openocd.zylin.com/1815 from Paul Fertser but is now done through scripting. Change-Id: I3386d8f96cdc477e7a2308dd18269de3bed04385 Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com> Signed-off-by: Paul Fertser <fercerpav@gmail.com> Reviewed-on: http://openocd.zylin.com/5081 Tested-by: jenkins Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
This commit is contained in:
committed by
Tomas Vanek
parent
6916550938
commit
6cb5ba6f11
@@ -249,14 +249,14 @@ COMMAND_HANDLER(handle_xsvf_command)
|
||||
if (strcmp(CMD_ARGV[0], "plain") != 0) {
|
||||
tap = jtag_tap_by_string(CMD_ARGV[0]);
|
||||
if (!tap) {
|
||||
command_print(CMD_CTX, "Tap: %s unknown", CMD_ARGV[0]);
|
||||
command_print(CMD, "Tap: %s unknown", CMD_ARGV[0]);
|
||||
return ERROR_FAIL;
|
||||
}
|
||||
}
|
||||
|
||||
xsvf_fd = open(filename, O_RDONLY);
|
||||
if (xsvf_fd < 0) {
|
||||
command_print(CMD_CTX, "file \"%s\" not found", filename);
|
||||
command_print(CMD, "file \"%s\" not found", filename);
|
||||
return ERROR_FAIL;
|
||||
}
|
||||
|
||||
@@ -1005,7 +1005,7 @@ COMMAND_HANDLER(handle_xsvf_command)
|
||||
}
|
||||
|
||||
if (tdo_mismatch) {
|
||||
command_print(CMD_CTX,
|
||||
command_print(CMD,
|
||||
"TDO mismatch, somewhere near offset %lu in xsvf file, aborting",
|
||||
file_offset);
|
||||
|
||||
@@ -1014,14 +1014,14 @@ COMMAND_HANDLER(handle_xsvf_command)
|
||||
|
||||
if (unsupported) {
|
||||
off_t offset = lseek(xsvf_fd, 0, SEEK_CUR) - 1;
|
||||
command_print(CMD_CTX,
|
||||
command_print(CMD,
|
||||
"unsupported xsvf command (0x%02X) at offset %jd, aborting",
|
||||
uc, (intmax_t)offset);
|
||||
return ERROR_FAIL;
|
||||
}
|
||||
|
||||
if (do_abort) {
|
||||
command_print(CMD_CTX, "premature end of xsvf file detected, aborting");
|
||||
command_print(CMD, "premature end of xsvf file detected, aborting");
|
||||
return ERROR_FAIL;
|
||||
}
|
||||
|
||||
@@ -1036,7 +1036,7 @@ COMMAND_HANDLER(handle_xsvf_command)
|
||||
|
||||
close(xsvf_fd);
|
||||
|
||||
command_print(CMD_CTX, "XSVF file programmed successfully");
|
||||
command_print(CMD, "XSVF file programmed successfully");
|
||||
|
||||
return ERROR_OK;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user