diff --git a/src/helper/command.c b/src/helper/command.c index 26eada62e..00d4b3561 100644 --- a/src/helper/command.c +++ b/src/helper/command.c @@ -33,7 +33,7 @@ int handle_sleep_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -int build_unique_lenghts(command_context_t *context, command_t *commands) +int build_unique_lengths(command_context_t *context, command_t *commands) { command_t *c, *p; @@ -64,7 +64,7 @@ int build_unique_lenghts(command_context_t *context, command_t *commands) /* if the current command has children, build the unique lengths for them */ if (c->children) - build_unique_lenghts(context, c->children); + build_unique_lengths(context, c->children); } return ERROR_OK; @@ -122,7 +122,7 @@ command_t* register_command(command_context_t *context, command_t *parent, char } /* update unique lengths */ - build_unique_lenghts(context, (parent) ? parent : context->commands); + build_unique_lengths(context, (parent) ? parent : context->commands); return c; } diff --git a/src/openocd.c b/src/openocd.c index 71b111a03..b0d0a844e 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -70,7 +70,7 @@ int main(int argc, char *argv[]) return EXIT_FAILURE; DEBUG("log init complete"); - INFO("Open On-Chip Debugger (Revision 63)"); + INFO("Open On-Chip Debugger (Revision 65)"); cfg_cmd_ctx = copy_command_context(cmd_ctx); cfg_cmd_ctx->mode = COMMAND_CONFIG; diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c index d7933293a..3ff3456a3 100644 --- a/src/server/telnet_server.c +++ b/src/server/telnet_server.c @@ -75,12 +75,12 @@ int telnet_target_callback_event_handler(struct target_s *target, enum target_ev buffer[511] = 0; command_print(cmd_ctx, "%s", buffer); telnet_prompt(connection); - t_con->surpress_prompt = 1; + t_con->suppress_prompt = 1; break; case TARGET_EVENT_RESUMED: command_print(cmd_ctx, "Target %i resumed", get_num_by_target(target)); telnet_prompt(connection); - t_con->surpress_prompt = 1; + t_con->suppress_prompt = 1; break; default: break; @@ -102,7 +102,7 @@ int telnet_new_connection(connection_t *connection) telnet_connection->line_cursor = 0; telnet_connection->option_size = 0; telnet_connection->prompt = strdup("> "); - telnet_connection->surpress_prompt = 0; + telnet_connection->suppress_prompt = 0; telnet_connection->state = TELNET_STATE_DATA; /* output goes through telnet connection */ @@ -246,7 +246,7 @@ int telnet_input(connection_t *connection) /* we're running a command, so we need a prompt * if the output handler is called, this gets set again */ - t_con->surpress_prompt = 0; + t_con->suppress_prompt = 0; if ((retval = command_run_line(command_context, t_con->line)) != ERROR_OK) { if (retval == ERROR_COMMAND_CLOSE_CONNECTION) @@ -277,13 +277,13 @@ int telnet_input(connection_t *connection) if (t_con->next_history > TELNET_LINE_HISTORY_SIZE - 1) t_con->next_history = 0; - if (!t_con->surpress_prompt) + if (!t_con->suppress_prompt) { telnet_prompt(connection); } else { - t_con->surpress_prompt = 0; + t_con->suppress_prompt = 0; } t_con->line_size = 0; diff --git a/src/server/telnet_server.h b/src/server/telnet_server.h index d6ca0e86c..7b4b4a223 100644 --- a/src/server/telnet_server.h +++ b/src/server/telnet_server.h @@ -44,7 +44,7 @@ enum telnet_states typedef struct telnet_connection_s { char *prompt; - int surpress_prompt; + int suppress_prompt; enum telnet_states state; char line[TELNET_LINE_MAX_SIZE]; int line_size;