From 517ba0690dcc9e859a05df2113ce32401a5ab254 Mon Sep 17 00:00:00 2001 From: Andreas Fritiofson Date: Mon, 30 Sep 2013 23:16:20 +0200 Subject: Clean up const usage to avoid excessive casting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Don't use const on pointers that hold heap allocated data, because that means functions that free them must cast away the const. Do use const on pointer parameters or fields that needn't be modified. Remove pointer casts that are no longer needed after fixing the constness. Change-Id: I5d206f5019982fd1950bc6d6d07b6062dc24e886 Signed-off-by: Andreas Fritiofson Reviewed-on: http://openocd.zylin.com/1668 Tested-by: jenkins Reviewed-by: Mathias Küster Reviewed-by: Spencer Oliver --- src/server/server.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/server/server.h') diff --git a/src/server/server.h b/src/server/server.h index e6a9195..b444939 100644 --- a/src/server/server.h +++ b/src/server/server.h @@ -55,9 +55,9 @@ typedef int (*input_handler_t)(struct connection *connection); typedef int (*connection_closed_handler_t)(struct connection *connection); struct service { - const char *name; + char *name; enum connection_type type; - const char *port; + char *port; unsigned short portnumber; int fd; struct sockaddr_in sin; @@ -101,14 +101,9 @@ void openocd_sleep_postlude(void); * Call server_port like a normal COMMAND_HANDLER with an extra @a out parameter * to receive the specified port number. */ -#define SERVER_PIPE_COMMAND() \ - COMMAND_HELPER(server_pipe_command, const char **out) -SERVER_PIPE_COMMAND(); +COMMAND_HELPER(server_pipe_command, char **out); -#define SERVER_PORT_COMMAND() \ - COMMAND_HELPER(server_port_command, unsigned short *out) - -SERVER_PORT_COMMAND(); +COMMAND_HELPER(server_port_command, unsigned short *out); #define ERROR_SERVER_REMOTE_CLOSED (-400) #define ERROR_CONNECTION_REJECTED (-401) -- cgit v1.1