* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
#ifdef HAVE_CONFIG_H
static void tcl_output(void *privData, const char *file, unsigned line,
const char *function, const char *string)
{
- struct log_capture_state *state = (struct log_capture_state *)privData;
+ struct log_capture_state *state = privData;
Jim_AppendString(state->interp, state->output, string, strlen(string));
}
if (return_retval != NULL)
*return_retval = retval;
- return (retval == ERROR_OK) ? JIM_OK : JIM_ERR;
+ return (retval == ERROR_OK) ? JIM_OK : retval;
}
extern struct command_context *global_cmd_ctx;
free(dbg);
}
-static void script_command_args_free(const char **words, unsigned nwords)
+static void script_command_args_free(char **words, unsigned nwords)
{
for (unsigned i = 0; i < nwords; i++)
- free((void *)words[i]);
+ free(words[i]);
free(words);
}
-static const char **script_command_args_alloc(
+static char **script_command_args_alloc(
unsigned argc, Jim_Obj * const *argv, unsigned *nwords)
{
- const char **words = malloc(argc * sizeof(char *));
+ char **words = malloc(argc * sizeof(char *));
if (NULL == words)
return NULL;
LOG_USER_N("%s", ""); /* Keep GDB connection alive*/
unsigned nwords;
- const char **words = script_command_args_alloc(argc, argv, &nwords);
+ char **words = script_command_args_alloc(argc, argv, &nwords);
if (NULL == words)
return JIM_ERR;
command_free(tmp);
}
- if (c->name)
- free((void *)c->name);
- if (c->help)
- free((void *)c->help);
- if (c->usage)
- free((void *)c->usage);
+ free(c->name);
+ free(c->help);
+ free(c->usage);
free(c);
}
struct command *c)
{
Jim_Interp *interp = cmd_ctx->interp;
- const char *ocd_name = alloc_printf("ocd_%s", c->name);
+ char *ocd_name = alloc_printf("ocd_%s", c->name);
if (NULL == ocd_name)
return JIM_ERR;
LOG_DEBUG("registering '%s'...", ocd_name);
- Jim_CmdProc func = c->handler ? &script_command : &command_unknown;
+ Jim_CmdProc *func = c->handler ? &script_command : &command_unknown;
int retval = Jim_CreateCommand(interp, ocd_name, func, c, NULL);
- free((void *)ocd_name);
+ free(ocd_name);
if (JIM_OK != retval)
return retval;
/* we now need to add an overrideable proc */
- const char *override_name = alloc_printf(
+ char *override_name = alloc_printf(
"proc %s {args} {eval ocd_bouncer %s $args}",
c->name, c->name);
if (NULL == override_name)
return JIM_ERR;
retval = Jim_Eval_Named(interp, override_name, 0, 0);
- free((void *)override_name);
+ free(override_name);
return retval;
}
}
Jim_DeleteAssocData(interp, "context");
}
- if (retcode == JIM_ERR) {
- if (retval != ERROR_COMMAND_CLOSE_CONNECTION) {
- /* We do not print the connection closed error message */
- Jim_MakeErrorMessage(interp);
- LOG_USER("%s", Jim_GetString(Jim_GetResult(interp), NULL));
- }
- if (retval == ERROR_OK) {
- /* It wasn't a low level OpenOCD command that failed */
- return ERROR_FAIL;
- }
- return retval;
- } else if (retcode == JIM_EXIT) {
- /* ignore.
- * exit(Jim_GetExitCode(interp)); */
- } else {
+ if (retcode == JIM_OK) {
const char *result;
int reslen;
LOG_USER_N("\n");
}
retval = ERROR_OK;
+ } else if (retcode == JIM_EXIT) {
+ /* ignore.
+ * exit(Jim_GetExitCode(interp)); */
+ } else if (retcode == ERROR_COMMAND_CLOSE_CONNECTION) {
+ return retcode;
+ } else {
+ Jim_MakeErrorMessage(interp);
+ LOG_USER("%s", Jim_GetString(Jim_GetResult(interp), NULL));
+
+ if (retval == ERROR_OK) {
+ /* It wasn't a low level OpenOCD command that failed */
+ return ERROR_FAIL;
+ }
+ return retval;
}
+
return retval;
}
}
static COMMAND_HELPER(command_help_show, struct command *c, unsigned n,
- bool show_help, const char *match);
+ bool show_help, const char *cmd_match);
static COMMAND_HELPER(command_help_show_list, struct command *head, unsigned n,
- bool show_help, const char *match)
+ bool show_help, const char *cmd_match)
{
for (struct command *c = head; NULL != c; c = c->next)
- CALL_COMMAND_HANDLER(command_help_show, c, n, show_help, match);
+ CALL_COMMAND_HANDLER(command_help_show, c, n, show_help, cmd_match);
return ERROR_OK;
}
}
static COMMAND_HELPER(command_help_show, struct command *c, unsigned n,
- bool show_help, const char *match)
+ bool show_help, const char *cmd_match)
{
char *cmd_name = command_name(c, ' ');
if (NULL == cmd_name)
/* If the match string occurs anywhere, we print out
* stuff for this command. */
- bool is_match = (strstr(cmd_name, match) != NULL) ||
- ((c->usage != NULL) && (strstr(c->usage, match) != NULL)) ||
- ((c->help != NULL) && (strstr(c->help, match) != NULL));
+ bool is_match = (strstr(cmd_name, cmd_match) != NULL) ||
+ ((c->usage != NULL) && (strstr(c->usage, cmd_match) != NULL)) ||
+ ((c->help != NULL) && (strstr(c->help, cmd_match) != NULL));
if (is_match) {
command_help_show_indent(n);
free(cmd_name);
if (is_match) {
- if (c->usage) {
+ if (c->usage && strlen(c->usage) > 0) {
LOG_USER_N(" ");
command_help_show_wrap(c->usage, 0, n + 5);
} else
}
return CALL_COMMAND_HANDLER(command_help_show_list,
- c->children, n, show_help, match);
+ c->children, n, show_help, cmd_match);
}
COMMAND_HANDLER(handle_help_command)
bool full = strcmp(CMD_NAME, "help") == 0;
int retval;
struct command *c = CMD_CTX->commands;
- char *match = NULL;
+ char *cmd_match = NULL;
if (CMD_ARGC == 0)
- match = "";
+ cmd_match = "";
else if (CMD_ARGC >= 1) {
unsigned i;
for (i = 0; i < CMD_ARGC; ++i) {
- if (NULL != match) {
- char *prev = match;
+ if (NULL != cmd_match) {
+ char *prev = cmd_match;
- match = alloc_printf("%s %s", match, CMD_ARGV[i]);
+ cmd_match = alloc_printf("%s %s", cmd_match, CMD_ARGV[i]);
free(prev);
- if (NULL == match) {
+ if (NULL == cmd_match) {
LOG_ERROR("unable to build search string");
return -ENOMEM;
}
} else {
- match = alloc_printf("%s", CMD_ARGV[i]);
- if (NULL == match) {
+ cmd_match = alloc_printf("%s", CMD_ARGV[i]);
+ if (NULL == cmd_match) {
LOG_ERROR("unable to build search string");
return -ENOMEM;
}
return ERROR_COMMAND_SYNTAX_ERROR;
retval = CALL_COMMAND_HANDLER(command_help_show_list,
- c, 0, full, match);
+ c, 0, full, cmd_match);
if (CMD_ARGC >= 1)
- free(match);
+ free(cmd_match);
return retval;
}
Jim_SetResultString(interp, "native", -1);
else if (c->handler)
Jim_SetResultString(interp, "simple", -1);
- else
+ else if (remaining == 0)
Jim_SetResultString(interp, "group", -1);
+ else
+ Jim_SetResultString(interp, "unknown", -1);
return JIM_OK;
}
if (help_text) {
bool replaced = false;
if (nc->help) {
- free((void *)nc->help);
+ free(nc->help);
replaced = true;
}
nc->help = strdup(help_text);
if (usage) {
bool replaced = false;
if (nc->usage) {
- free((void *)nc->usage);
+ free(nc->usage);
replaced = true;
}
nc->usage = strdup(usage);
return retval;
if (!busy) {
- long long then = timeval_ms();
- while (timeval_ms() - then < (long long)duration) {
+ int64_t then = timeval_ms();
+ while (timeval_ms() - then < (int64_t)duration) {
target_call_timer_callbacks_now();
usleep(1000);
}
DEFINE_PARSE_ULONGLONG(_u16, uint16_t, 0, UINT16_MAX)
DEFINE_PARSE_ULONGLONG(_u8, uint8_t, 0, UINT8_MAX)
+DEFINE_PARSE_ULONGLONG(_target_addr, target_addr_t, 0, TARGET_ADDR_MAX)
+
#define DEFINE_PARSE_LONGLONG(name, type, min, max) \
DEFINE_PARSE_WRAPPER(name, type, min, max, long long, _llong)
DEFINE_PARSE_LONGLONG(_int, int, n < INT_MIN, INT_MAX)
projects / fw / openocd / blobdiff