Clean up const usage to avoid excessive casting

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 <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/1668
Tested-by: jenkins
Reviewed-by: Mathias Küster <kesmtp@freenet.de>
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>

5 files changed, 16 insertions, 22 deletions

diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 660e05ef..c49f87c1 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -104,8 +104,8 @@ static int gdb_breakpoint_override;
 static enum breakpoint_type gdb_breakpoint_override_type;
 
 static int gdb_error(struct connection *connection, int retval);
-static const char *gdb_port;
-static const char *gdb_port_next;
+static char *gdb_port;
+static char *gdb_port_next;
 
 static void gdb_log_callback(void *priv, const char *file, unsigned line,
 		const char *function, const char *string);
@@ -2900,7 +2900,7 @@ static int gdb_target_add_one(struct target *target)
 		portnumber = strtol(gdb_port_next, &end, 0);
 		if (!*end) {
 			if (parse_long(gdb_port_next, &portnumber) == ERROR_OK) {
-				free((void *)gdb_port_next);
+				free(gdb_port_next);
 				gdb_port_next = alloc_printf("%d", portnumber+1);
 			}
 		}
@@ -2947,7 +2947,7 @@ COMMAND_HANDLER(handle_gdb_port_command)
 {
 	int retval = CALL_COMMAND_HANDLER(server_pipe_command, &gdb_port);
 	if (ERROR_OK == retval) {
-		free((void *)gdb_port_next);
+		free(gdb_port_next);
 		gdb_port_next = strdup(gdb_port);
 	}
 	return retval;
diff --git a/src/server/server.c b/src/server/server.c
index 01e84412..5e1ae36b 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -303,14 +303,14 @@ static int remove_services(void)
 		struct service *next = c->next;
 
 		if (c->name)
-			free((void *)c->name);
+			free(c->name);
 
 		if (c->type == CONNECTION_PIPE) {
 			if (c->fd != -1)
 				close(c->fd);
 		}
 		if (c->port)
-			free((void *)c->port);
+			free(c->port);
 
 		if (c->priv)
 			free(c->priv);
@@ -612,7 +612,7 @@ int server_register_commands(struct command_context *cmd_ctx)
 	return register_commands(cmd_ctx, NULL, server_command_handlers);
 }
 
-SERVER_PORT_COMMAND()
+COMMAND_HELPER(server_port_command, unsigned short *out)
 {
 	switch (CMD_ARGC) {
 		case 0:
@@ -631,7 +631,7 @@ SERVER_PORT_COMMAND()
 	return ERROR_OK;
 }
 
-SERVER_PIPE_COMMAND()
+COMMAND_HELPER(server_pipe_command, char **out)
 {
 	switch (CMD_ARGC) {
 		case 0:
@@ -643,9 +643,8 @@ SERVER_PIPE_COMMAND()
 				LOG_WARNING("unable to change server port after init");
 				return ERROR_COMMAND_ARGUMENT_INVALID;
 			}
-			const char *t = strdup(CMD_ARGV[0]);
-			free((void *)*out);
-			*out = t;
+			free(*out);
+			*out = strdup(CMD_ARGV[0]);
 			break;
 		}
 		default:
diff --git a/src/server/server.h b/src/server/server.h
index e6a91953..b4449397 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)
diff --git a/src/server/tcl_server.c b/src/server/tcl_server.c
index f3a931ee..91f97786 100644
--- a/src/server/tcl_server.c
+++ b/src/server/tcl_server.c
@@ -34,7 +34,7 @@ struct tcl_connection {
 	int tc_outerror;/* flag an output error */
 };
 
-static const char *tcl_port;
+static char *tcl_port;
 
 /* handlers */
 static int tcl_new_connection(struct connection *connection);
diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c
index f9517856..92d8c5ea 100644
--- a/src/server/telnet_server.c
+++ b/src/server/telnet_server.c
@@ -32,7 +32,7 @@
 #include <target/target_request.h>
 #include <helper/configuration.h>
 
-static const char *telnet_port;
+static char *telnet_port;
 
 static char *negotiate =
 	"\xFF\xFB\x03"			/* IAC WILL Suppress Go Ahead */