diff options
author | Zachary T Welch <zw@superlucidity.net> | 2009-11-13 08:07:00 -0800 |
---|---|---|
committer | Zachary T Welch <zw@superlucidity.net> | 2009-11-13 11:58:08 -0800 |
commit | 8775a0f6638d966b6ef135b488da6efb954e2573 (patch) | |
tree | ff97fe278727e0c6bbeab89159ed12aed4f7147b /src | |
parent | e01a0be57655683c58e9dd5e66ee30fe3049e8d9 (diff) | |
download | openocd+libswd-8775a0f6638d966b6ef135b488da6efb954e2573.tar.gz openocd+libswd-8775a0f6638d966b6ef135b488da6efb954e2573.tar.bz2 openocd+libswd-8775a0f6638d966b6ef135b488da6efb954e2573.tar.xz openocd+libswd-8775a0f6638d966b6ef135b488da6efb954e2573.zip |
service_t -> struct service
Remove misleading typedef and redundant suffix from struct service.
Diffstat (limited to 'src')
-rw-r--r-- | src/server/server.c | 20 | ||||
-rw-r--r-- | src/server/server.h | 8 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/server/server.c b/src/server/server.c index ada0a602..59ed1a5c 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -37,7 +37,7 @@ #endif -service_t *services = NULL; +struct service *services = NULL; /* shutdown_openocd == 1: exit the main event loop, and quit the debugger */ static int shutdown_openocd = 0; @@ -45,7 +45,7 @@ static int shutdown_openocd = 0; /* set when using pipes rather than tcp */ int server_use_pipes = 0; -int add_connection(service_t *service, command_context_t *cmd_ctx) +int add_connection(struct service *service, command_context_t *cmd_ctx) { socklen_t address_size; connection_t *c, **p; @@ -109,7 +109,7 @@ int add_connection(service_t *service, command_context_t *cmd_ctx) return ERROR_OK; } -int remove_connection(service_t *service, connection_t *connection) +int remove_connection(struct service *service, connection_t *connection) { connection_t **p = &service->connections; connection_t *c; @@ -141,10 +141,10 @@ int remove_connection(service_t *service, connection_t *connection) 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) { - service_t *c, **p; + struct service *c, **p; int so_reuseaddr_option = 1; - c = malloc(sizeof(service_t)); + c = malloc(sizeof(struct service)); c->name = strdup(name); c->type = type; @@ -232,8 +232,8 @@ int add_service(char *name, enum connection_type type, unsigned short port, int int remove_service(unsigned short port) { - service_t **p = &services; - service_t *c; + struct service **p = &services; + struct service *c; /* find service */ while ((c = *p)) @@ -260,12 +260,12 @@ int remove_service(unsigned short port) int remove_services(void) { - service_t *c = services; + struct service *c = services; /* loop service */ while (c) { - service_t *next = c->next; + struct service *next = c->next; if (c->name) free(c->name); @@ -290,7 +290,7 @@ extern void openocd_sleep_postlude(void); int server_loop(command_context_t *command_context) { - service_t *service; + struct service *service; /* used in select() */ fd_set read_fds; diff --git a/src/server/server.h b/src/server/server.h index abb501d4..2bfedb49 100644 --- a/src/server/server.h +++ b/src/server/server.h @@ -43,7 +43,7 @@ typedef struct connection_s int fd; struct sockaddr_in sin; command_context_t *cmd_ctx; - struct service_s *service; + struct service *service; int input_pending; void *priv; struct connection_s *next; @@ -53,7 +53,7 @@ typedef int (*new_connection_handler_t)(connection_t *connection); typedef int (*input_handler_t)(connection_t *connection); typedef int (*connection_closed_handler_t)(connection_t *connection); -typedef struct service_s +struct service { char *name; enum connection_type type; @@ -66,8 +66,8 @@ typedef struct service_s input_handler_t input; connection_closed_handler_t connection_closed; void *priv; - struct service_s *next; -} service_t; + struct service *next; +}; int add_service(char *name, enum connection_type type, unsigned short port, int max_connections, new_connection_handler_t new_connection_handler, |