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

src/server/gdb_server.h

@@ -26,6 +26,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifndef GDB_SERVER_H
 #define GDB_SERVER_H
 
@@ -33,7 +34,7 @@ struct image;
 struct reg;
 #include <target/target.h>
 
-#define GDB_BUFFER_SIZE	16384
+#define GDB_BUFFER_SIZE 16384
 
 int gdb_target_add_all(struct target *target);
 int gdb_register_commands(struct command_context *command_context);
@@ -49,4 +50,4 @@ static inline struct target *get_target_from_connection(struct connection *conne
 #define ERROR_GDB_BUFFER_TOO_SMALL (-800)
 #define ERROR_GDB_TIMEOUT (-801)
 
-#endif /* GDB_SERVER_H */
+#endif	/* GDB_SERVER_H */

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 */

src/server/server_stubs.c

@@ -24,9 +24,9 @@
 
 void openocd_sleep_prelude(void)
 {
-	// no-op
+	/* no-op */
 }
 void openocd_sleep_postlude(void)
 {
-	// no-op
+	/* no-op */
 }

src/server/tcl_server.c

@@ -24,15 +24,14 @@
 
 #include "tcl_server.h"
 
-
-#define TCL_SERVER_VERSION	"TCL Server 0.1"
-#define TCL_MAX_LINE		(4096)
+#define TCL_SERVER_VERSION		"TCL Server 0.1"
+#define TCL_MAX_LINE			(4096)
 
 struct tcl_connection {
 	int tc_linedrop;
 	int tc_lineoffset;
 	char tc_line[TCL_MAX_LINE];
-	int tc_outerror; /* flag an output error */
+	int tc_outerror;/* flag an output error */
 };
 
 static const char *tcl_port;
@@ -104,8 +103,7 @@ static int tcl_input(struct connection *connection)
 		return ERROR_CONNECTION_REJECTED;
 
 	/* push as much data into the line as possible */
-	for (i = 0; i < rlen; i++)
-	{
+	for (i = 0; i < rlen; i++) {
 		/* buffer the data */
 		tclc->tc_line[tclc->tc_lineoffset] = in[i];
 		if (tclc->tc_lineoffset < TCL_MAX_LINE)
@@ -127,12 +125,12 @@ static int tcl_input(struct connection *connection)
 			if (retval != ERROR_OK)
 				return retval;
 #undef ESTR
-		}
-		else {
+		} else {
 			tclc->tc_line[tclc->tc_lineoffset-1] = '\0';
 			LOG_DEBUG("Executing script:\n %s", tclc->tc_line);
-			retval = Jim_Eval_Named(interp, tclc->tc_line, "remote:connection",1);
-			LOG_DEBUG("Result: %d\n %s", retval, Jim_GetString(Jim_GetResult(interp), &reslen));
+			retval = Jim_Eval_Named(interp, tclc->tc_line, "remote:connection", 1);
+			LOG_DEBUG("Result: %d\n %s", retval,
+				Jim_GetString(Jim_GetResult(interp), &reslen));
 			result = Jim_GetString(Jim_GetResult(interp), &reslen);
 			retval = tcl_output(connection, result, reslen);
 			if (retval != ERROR_OK)
@@ -160,15 +158,14 @@ static int tcl_closed(struct connection *connection)
 
 int tcl_init(void)
 {
-	if (strcmp(tcl_port, "disabled") == 0)
-	{
+	if (strcmp(tcl_port, "disabled") == 0) {
 		LOG_INFO("tcl server disabled");
 		return ERROR_OK;
 	}
 
 	return add_service("tcl", tcl_port, 1,
-			&tcl_new_connection, &tcl_input,
-			&tcl_closed, NULL);
+		&tcl_new_connection, &tcl_input,
+		&tcl_closed, NULL);
 }
 
 COMMAND_HANDLER(handle_tcl_port_command)

src/server/tcl_server.h

@@ -25,4 +25,4 @@
 int tcl_init(void);
 int tcl_register_commands(struct command_context *cmd_ctx);
 
-#endif /* _TCL_SERVER_H_ */
+#endif	/* _TCL_SERVER_H_ */

src/server/telnet_server.h

@@ -23,6 +23,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifndef TELNET_SERVER_H
 #define TELNET_SERVER_H
 
@@ -34,8 +35,7 @@
 #define TELNET_LINE_HISTORY_SIZE (128)
 #define TELNET_LINE_MAX_SIZE (256)
 
-enum telnet_states
-{
+enum telnet_states {
 	TELNET_STATE_DATA,
 	TELNET_STATE_IAC,
 	TELNET_STATE_SB,
@@ -47,8 +47,7 @@ enum telnet_states
 	TELNET_STATE_ESCAPE,
 };
 
-struct telnet_connection
-{
+struct telnet_connection {
 	char *prompt;
 	enum telnet_states state;
 	char line[TELNET_LINE_MAX_SIZE];
@@ -63,12 +62,11 @@ struct telnet_connection
 	int closed;
 };
 
-struct telnet_service
-{
+struct telnet_service {
 	char *banner;
 };
 
 int telnet_init(char *banner);
 int telnet_register_commands(struct command_context *command_context);
 
-#endif /* TELNET_SERVER_H */
+#endif	/* TELNET_SERVER_H */