diff options
| author | Spencer Oliver <spen@spen-soft.co.uk> | 2012-01-30 12:05:19 +0000 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2012-02-06 10:47:01 +0000 |
| commit | b48d1f66378fac886d5bc32d7302da48c89d8a75 (patch) | |
| tree | 3782742756407e392a230e26c0af8699c94767ec /src/server/server.h | |
| parent | 91e054a9eaefcfdb2b4e1afa99494f31481bc777 (diff) | |
build: cleanup src/server directory
Change-Id: I6410df28c5999f5cbee2d3bcaa02469a29ea4c15
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/412
Tested-by: jenkins
Diffstat (limited to 'src/server/server.h')
| -rw-r--r-- | src/server/server.h | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/server/server.h b/src/server/server.h index 34cf1cf0..b6ff5ed9 100644 --- a/src/server/server.h +++ b/src/server/server.h @@ -23,6 +23,7 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + #ifndef SERVER_H #define SERVER_H @@ -32,17 +33,15 @@ #include <netinet/in.h> #endif -enum connection_type -{ +enum connection_type { CONNECTION_TCP, CONNECTION_PIPE, CONNECTION_STDINOUT }; -struct connection -{ +struct connection { int fd; - int fd_out; /* When using pipes we're writing to a different fd */ + int fd_out; /* When using pipes we're writing to a different fd */ struct sockaddr_in sin; struct command_context *cmd_ctx; struct service *service; @@ -55,8 +54,7 @@ typedef int (*new_connection_handler_t)(struct connection *connection); typedef int (*input_handler_t)(struct connection *connection); typedef int (*connection_closed_handler_t)(struct connection *connection); -struct service -{ +struct service { const char *name; enum connection_type type; const char *port; @@ -104,15 +102,15 @@ void openocd_sleep_postlude(void); * to receive the specified port number. */ #define SERVER_PIPE_COMMAND() \ - COMMAND_HELPER(server_pipe_command, const char **out) + COMMAND_HELPER(server_pipe_command, const char **out) SERVER_PIPE_COMMAND(); #define SERVER_PORT_COMMAND() \ - COMMAND_HELPER(server_port_command, unsigned short *out) + COMMAND_HELPER(server_port_command, unsigned short *out) SERVER_PORT_COMMAND(); -#define ERROR_SERVER_REMOTE_CLOSED (-400) -#define ERROR_CONNECTION_REJECTED (-401) +#define ERROR_SERVER_REMOTE_CLOSED (-400) +#define ERROR_CONNECTION_REJECTED (-401) -#endif /* SERVER_H */ +#endif /* SERVER_H */ |