X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=5e1ae36b1db0d84e2178b392f5b2b4d31f61309e;hb=517ba0690dcc9e859a05df2113ce32401a5ab254;hp=01e844123e9ad373508d42a596bf1979b127be62;hpb=c044c601213ee800cffb21e1f53a89285b3346c9;p=openocd.git

diff --git a/src/server/server.c b/src/server/server.c
index 01e844123e..5e1ae36b1d 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: