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
@@ -116,12 +116,12 @@ COMMAND_HANDLER(handle_pld_devices_command)
|
||||
int i = 0;
|
||||
|
||||
if (!pld_devices) {
|
||||
command_print(CMD_CTX, "no pld devices configured");
|
||||
command_print(CMD, "no pld devices configured");
|
||||
return ERROR_OK;
|
||||
}
|
||||
|
||||
for (p = pld_devices; p; p = p->next)
|
||||
command_print(CMD_CTX, "#%i: %s", i++, p->driver->name);
|
||||
command_print(CMD, "#%i: %s", i++, p->driver->name);
|
||||
|
||||
return ERROR_OK;
|
||||
}
|
||||
@@ -141,13 +141,13 @@ COMMAND_HANDLER(handle_pld_load_command)
|
||||
COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], dev_id);
|
||||
p = get_pld_device_by_num(dev_id);
|
||||
if (!p) {
|
||||
command_print(CMD_CTX, "pld device '#%s' is out of bounds", CMD_ARGV[0]);
|
||||
command_print(CMD, "pld device '#%s' is out of bounds", CMD_ARGV[0]);
|
||||
return ERROR_OK;
|
||||
}
|
||||
|
||||
retval = p->driver->load(p, CMD_ARGV[1]);
|
||||
if (retval != ERROR_OK) {
|
||||
command_print(CMD_CTX, "failed loading file %s to pld device %u",
|
||||
command_print(CMD, "failed loading file %s to pld device %u",
|
||||
CMD_ARGV[1], dev_id);
|
||||
switch (retval) {
|
||||
}
|
||||
@@ -156,7 +156,7 @@ COMMAND_HANDLER(handle_pld_load_command)
|
||||
gettimeofday(&end, NULL);
|
||||
timeval_subtract(&duration, &end, &start);
|
||||
|
||||
command_print(CMD_CTX, "loaded file %s to pld device %u in %jis %jius",
|
||||
command_print(CMD, "loaded file %s to pld device %u in %jis %jius",
|
||||
CMD_ARGV[1], dev_id,
|
||||
(intmax_t)duration.tv_sec, (intmax_t)duration.tv_usec);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user