X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2Fserver.h;h=bbcfdc0fafb045c04968bd42f84081604d533e5d;hp=face13867fabdadb084114d85a4bbf6fe8fa5340;hb=39650e2273bcae868d9509fe36515936ce25aacb;hpb=50d5441e2a615fb2c44b41a777e4373901f7a2e6

diff --git a/src/server/server.h b/src/server/server.h
index face13867f..bbcfdc0faf 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,9 +54,8 @@ 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
-{
-	char *name;
+struct service {
+	const char *name;
 	enum connection_type type;
 	const char *port;
 	unsigned short portnumber;
@@ -89,11 +87,11 @@ int connection_write(struct connection *connection, const void *data, int len);
 int connection_read(struct connection *connection, void *data, int len);
 
 /**
- * Used by server_loop(), defined in server_stubs.c, httpd.c, or ecosboard.c
+ * Used by server_loop(), defined in server_stubs.c
  */
 void openocd_sleep_prelude(void);
 /**
- * Used by server_loop(), defined in server_stubs.c, httpd.c, or ecosboard.c
+ * Used by server_loop(), defined in server_stubs.c
  */
 void openocd_sleep_postlude(void);
 
@@ -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 */