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));
}
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) {
+ if (retval == ERROR_COMMAND_CLOSE_CONNECTION) {
+ /* Shutdown request is not an error */
+ return ERROR_OK;
+ } else {
/* We do not print the connection closed error message */
Jim_MakeErrorMessage(interp);
LOG_USER("%s", Jim_GetString(Jim_GetResult(interp), NULL));
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
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);