diff options
| author | Zachary T Welch <zw@superlucidity.net> | 2009-11-13 08:07:36 -0800 |
|---|---|---|
| committer | Zachary T Welch <zw@superlucidity.net> | 2009-11-13 11:58:08 -0800 |
| commit | f7cd2aa0ef2939f7d3df5f4a86f5e777a27dbd37 (patch) | |
| tree | 046960fe975d25fc52de02004e498c2272b2e457 /src/server | |
| parent | f2cbaba3cc4af99db7b4f2682c2e0dd4467655e3 (diff) | |
| download | openocd+libswd-f7cd2aa0ef2939f7d3df5f4a86f5e777a27dbd37.tar.gz openocd+libswd-f7cd2aa0ef2939f7d3df5f4a86f5e777a27dbd37.tar.bz2 openocd+libswd-f7cd2aa0ef2939f7d3df5f4a86f5e777a27dbd37.tar.xz openocd+libswd-f7cd2aa0ef2939f7d3df5f4a86f5e777a27dbd37.zip | |
telnet_connection_t -> struct telnet_connection
Remove misleading typedef and redundant suffix from struct telnet_connection.
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/telnet_server.c | 16 | ||||
| -rw-r--r-- | src/server/telnet_server.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c index 9c611558..13ac0877 100644 --- a/src/server/telnet_server.c +++ b/src/server/telnet_server.c @@ -46,7 +46,7 @@ static char *negotiate = */ int telnet_write(connection_t *connection, const void *data, int len) { - telnet_connection_t *t_con = connection->priv; + struct telnet_connection *t_con = connection->priv; if (t_con->closed) return ERROR_SERVER_REMOTE_CLOSED; @@ -60,7 +60,7 @@ int telnet_write(connection_t *connection, const void *data, int len) int telnet_prompt(connection_t *connection) { - telnet_connection_t *t_con = connection->priv; + struct telnet_connection *t_con = connection->priv; telnet_write(connection, "\r", 1); /* the prompt is always placed at the line beginning */ return telnet_write(connection, t_con->prompt, strlen(t_con->prompt)); @@ -105,7 +105,7 @@ void telnet_log_callback(void *priv, const char *file, unsigned line, const char *function, const char *string) { connection_t *connection = priv; - telnet_connection_t *t_con = connection->priv; + struct telnet_connection *t_con = connection->priv; int i; /* if there is no prompt, simply output the message */ @@ -133,7 +133,7 @@ void telnet_log_callback(void *priv, const char *file, unsigned line, int telnet_new_connection(connection_t *connection) { - telnet_connection_t *telnet_connection = malloc(sizeof(telnet_connection_t)); + struct telnet_connection *telnet_connection = malloc(sizeof(struct telnet_connection)); struct telnet_service *telnet_service = connection->service->priv; int i; @@ -175,7 +175,7 @@ int telnet_new_connection(connection_t *connection) return ERROR_OK; } -void telnet_clear_line(connection_t *connection, telnet_connection_t *t_con) +void telnet_clear_line(connection_t *connection, struct telnet_connection *t_con) { /* move to end of line */ if (t_con->line_cursor < t_con->line_size) @@ -197,7 +197,7 @@ int telnet_input(connection_t *connection) int bytes_read; char buffer[TELNET_BUFFER_SIZE]; char *buf_p; - telnet_connection_t *t_con = connection->priv; + struct telnet_connection *t_con = connection->priv; command_context_t *command_context = connection->cmd_ctx; bytes_read = read_socket(connection->fd, buffer, TELNET_BUFFER_SIZE); @@ -539,7 +539,7 @@ int telnet_input(connection_t *connection) int telnet_connection_closed(connection_t *connection) { - telnet_connection_t *t_con = connection->priv; + struct telnet_connection *t_con = connection->priv; int i; log_remove_callback(telnet_log_callback, connection); @@ -577,7 +577,7 @@ int telnet_connection_closed(connection_t *connection) int telnet_set_prompt(connection_t *connection, char *prompt) { - telnet_connection_t *t_con = connection->priv; + struct telnet_connection *t_con = connection->priv; if (t_con->prompt != NULL) free(t_con->prompt); diff --git a/src/server/telnet_server.h b/src/server/telnet_server.h index d6e92228..c45a4236 100644 --- a/src/server/telnet_server.h +++ b/src/server/telnet_server.h @@ -47,7 +47,7 @@ enum telnet_states TELNET_STATE_ESCAPE, }; -typedef struct telnet_connection_s +struct telnet_connection { char *prompt; enum telnet_states state; @@ -61,7 +61,7 @@ typedef struct telnet_connection_s int next_history; int current_history; int closed; -} telnet_connection_t; +}; struct telnet_service { |