forked from auracaster/openocd
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
@@ -113,10 +113,10 @@ COMMAND_HANDLER(handle_cat_command)
|
||||
|
||||
int retval = load_file(CMD_ARGV[0], &data, &len);
|
||||
if (retval == ERROR_OK) {
|
||||
command_print(CMD_CTX, "%s", data);
|
||||
command_print(CMD, "%s", data);
|
||||
free(data);
|
||||
} else
|
||||
command_print(CMD_CTX, "%s not found", CMD_ARGV[0]);
|
||||
command_print(CMD, "%s not found", CMD_ARGV[0]);
|
||||
|
||||
return ERROR_OK;
|
||||
}
|
||||
@@ -146,10 +146,10 @@ COMMAND_HANDLER(handle_meminfo_command)
|
||||
info = mallinfo();
|
||||
|
||||
if (prev > 0)
|
||||
command_print(CMD_CTX, "Diff: %d", prev - info.fordblks);
|
||||
command_print(CMD, "Diff: %d", prev - info.fordblks);
|
||||
prev = info.fordblks;
|
||||
|
||||
command_print(CMD_CTX, "Available ram: %d", info.fordblks);
|
||||
command_print(CMD, "Available ram: %d", info.fordblks);
|
||||
|
||||
return ERROR_OK;
|
||||
}
|
||||
@@ -217,7 +217,7 @@ COMMAND_HANDLER(handle_cp_command)
|
||||
if (retval != ERROR_OK)
|
||||
break;
|
||||
|
||||
command_print(CMD_CTX, "%zu", len - pos);
|
||||
command_print(CMD, "%zu", len - pos);
|
||||
|
||||
pos += chunk;
|
||||
|
||||
@@ -226,9 +226,9 @@ COMMAND_HANDLER(handle_cp_command)
|
||||
}
|
||||
|
||||
if (retval == ERROR_OK)
|
||||
command_print(CMD_CTX, "Copied %s to %s", CMD_ARGV[0], CMD_ARGV[1]);
|
||||
command_print(CMD, "Copied %s to %s", CMD_ARGV[0], CMD_ARGV[1]);
|
||||
else
|
||||
command_print(CMD_CTX, "copy failed");
|
||||
command_print(CMD, "copy failed");
|
||||
|
||||
if (data != NULL)
|
||||
free(data);
|
||||
|
||||
Reference in New Issue
Block a user