From: Zachary T Welch Date: Mon, 9 Nov 2009 11:38:34 +0000 (-0800) Subject: src/{server,pld,svf,xsvf}: remove 'extern' keyword X-Git-Tag: v0.4.0-rc1~873 X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=994a63c3fee11b8c65891ead6b03b2b716044541;ds=sidebyside src/{server,pld,svf,xsvf}: remove 'extern' keyword Removes 'extern' keyword from function declarations in header filess. --- diff --git a/src/pld/pld.h b/src/pld/pld.h index e4cfc07157..c6d3c9248f 100644 --- a/src/pld/pld.h +++ b/src/pld/pld.h @@ -39,9 +39,11 @@ typedef struct pld_device_s struct pld_device_s *next; } pld_device_t; -extern int pld_register_commands(struct command_context_s *cmd_ctx); -extern int pld_init(struct command_context_s *cmd_ctx); -extern pld_device_t *get_pld_device_by_num(int num); +int pld_register_commands(struct command_context_s *cmd_ctx); + +int pld_init(struct command_context_s *cmd_ctx); + +pld_device_t *get_pld_device_by_num(int num); #define ERROR_PLD_DEVICE_INVALID (-1000) #define ERROR_PLD_FILE_LOAD_FAILED (-1001) diff --git a/src/server/gdb_server.h b/src/server/gdb_server.h index ea981f3164..4e334bc0b6 100644 --- a/src/server/gdb_server.h +++ b/src/server/gdb_server.h @@ -54,8 +54,8 @@ typedef struct gdb_service_s struct target_s *target; } gdb_service_t; -extern int gdb_init(void); -extern int gdb_register_commands(command_context_t *command_context); +int gdb_init(void); +int gdb_register_commands(command_context_t *command_context); #define ERROR_GDB_BUFFER_TOO_SMALL (-800) #define ERROR_GDB_TIMEOUT (-801) diff --git a/src/server/server.h b/src/server/server.h index dab28eca3d..d4f1b6b5a5 100644 --- a/src/server/server.h +++ b/src/server/server.h @@ -69,11 +69,17 @@ typedef struct service_s struct service_s *next; } service_t; -extern int add_service(char *name, enum connection_type type, unsigned short port, int max_connections, new_connection_handler_t new_connection_handler, input_handler_t input_handler, connection_closed_handler_t connection_closed_handler, void *priv); -extern int server_init(void); -extern int server_quit(void); -extern int server_loop(command_context_t *command_context); -extern int server_register_commands(command_context_t *context); +int add_service(char *name, enum connection_type type, unsigned short port, + int max_connections, new_connection_handler_t new_connection_handler, + input_handler_t in_handler, connection_closed_handler_t close_handler, + void *priv); + +int server_init(void); +int server_quit(void); + +int server_loop(command_context_t *command_context); + +int server_register_commands(command_context_t *context); int server_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, unsigned short *port); diff --git a/src/server/tcl_server.h b/src/server/tcl_server.h index c90dc8e92b..d6c9e10b1c 100644 --- a/src/server/tcl_server.h +++ b/src/server/tcl_server.h @@ -22,7 +22,7 @@ #include "server.h" -extern int tcl_init(void); -extern int tcl_register_commands(command_context_t *cmd_ctx); +int tcl_init(void); +int tcl_register_commands(command_context_t *cmd_ctx); #endif /* _TCL_SERVER_H_ */ diff --git a/src/server/telnet_server.h b/src/server/telnet_server.h index 541d720d4b..8f0d24abfe 100644 --- a/src/server/telnet_server.h +++ b/src/server/telnet_server.h @@ -68,7 +68,7 @@ typedef struct telnet_service_s char *banner; } telnet_service_t; -extern int telnet_init(char *banner); -extern int telnet_register_commands(command_context_t *command_context); +int telnet_init(char *banner); +int telnet_register_commands(command_context_t *command_context); #endif /* TELNET_SERVER_H */ diff --git a/src/svf/svf.h b/src/svf/svf.h index 83123fc3b6..329fea93b1 100644 --- a/src/svf/svf.h +++ b/src/svf/svf.h @@ -22,7 +22,7 @@ #include "command.h" -extern int svf_register_commands(struct command_context_s *cmd_ctx); +int svf_register_commands(struct command_context_s *cmd_ctx); /** * svf_add_statemove() moves from the current state to @a goal_state. @@ -35,7 +35,7 @@ extern int svf_register_commands(struct command_context_s *cmd_ctx); * SVF specification for single-argument STATE commands (and also used * for various other state transitions). */ -extern int svf_add_statemove(tap_state_t goal_state); +int svf_add_statemove(tap_state_t goal_state); /** * svf_tap_state_is_stable() returns true for stable non-SHIFT states @@ -43,6 +43,6 @@ extern int svf_add_statemove(tap_state_t goal_state); * @param state The TAP state in question * @return true iff the state is stable and not a SHIFT state. */ -extern bool svf_tap_state_is_stable(tap_state_t state); +bool svf_tap_state_is_stable(tap_state_t state); #endif /* SVF_H */ diff --git a/src/xsvf/xsvf.h b/src/xsvf/xsvf.h index 017af882ed..93cccf0ae0 100644 --- a/src/xsvf/xsvf.h +++ b/src/xsvf/xsvf.h @@ -22,7 +22,7 @@ #include "command.h" -extern int xsvf_register_commands(struct command_context_s *cmd_ctx); +int xsvf_register_commands(struct command_context_s *cmd_ctx); #define ERROR_XSVF_EOF (-200) #define ERROR_XSVF_FAILED (-201)