diff options
| author | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2013-09-30 23:16:20 +0200 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2013-10-31 20:42:34 +0000 |
| commit | 517ba0690dcc9e859a05df2113ce32401a5ab254 (patch) | |
| tree | 7f437e78a54eb7cb6af06ed589c8ceef0c5277bf /src/server/server.h | |
| parent | c044c601213ee800cffb21e1f53a89285b3346c9 (diff) | |
| download | riscv-openocd-517ba0690dcc9e859a05df2113ce32401a5ab254.zip riscv-openocd-517ba0690dcc9e859a05df2113ce32401a5ab254.tar.gz riscv-openocd-517ba0690dcc9e859a05df2113ce32401a5ab254.tar.bz2 | |
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>
Diffstat (limited to 'src/server/server.h')
| -rw-r--r-- | src/server/server.h | 13 |
1 files changed, 4 insertions, 9 deletions
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) |