diff --git a/gmid.h b/gmid.h index 9b4ee4a..d098fd4 100644 --- a/gmid.h +++ b/gmid.h @@ -412,7 +412,6 @@ void mark_nonblock(int); void client_write(struct bufferevent *, void *); int start_reply(struct client*, int, const char*); void client_close(struct client *); -struct client *client_by_id(int); void server_accept(int, short, void *); void server_init(struct privsep *, struct privsep_proc *, void *); int server_configure_done(struct conf *); diff --git a/parse.y b/parse.y index a570543..577af2f 100644 --- a/parse.y +++ b/parse.y @@ -92,11 +92,9 @@ char *ensure_absolute_path(char*); int check_block_code(int); char *check_block_fmt(char*); int check_strip_no(int); -int check_port_num(int); int check_prefork_num(int); void advance_loc(void); void advance_proxy(void); -void parsehp(char *, char **, const char **, const char *); int fastcgi_conf(const char *, const char *); void add_param(char *, char *); int getservice(const char *); @@ -1203,16 +1201,6 @@ check_strip_no(int n) return n; } -int -check_port_num(int n) -{ - if (n <= 0 || n >= UINT16_MAX) - yyerror("port number is %s: %d", - n <= 0 ? "too small" : "too large", - n); - return n; -} - int check_prefork_num(int n) { @@ -1235,25 +1223,6 @@ advance_proxy(void) TAILQ_INSERT_TAIL(&host->proxies, proxy, proxies); } -void -parsehp(char *str, char **host, const char **port, const char *def) -{ - char *at; - const char *errstr; - - *host = str; - - if ((at = strchr(str, ':')) != NULL) { - *at++ = '\0'; - *port = at; - } else - *port = def; - - strtonum(*port, 1, UINT16_MAX, &errstr); - if (errstr != NULL) - yyerror("port is %s: %s", errstr, *port); -} - int fastcgi_conf(const char *path, const char *port) { diff --git a/server.c b/server.c index 748ac45..ad66fee 100644 --- a/server.c +++ b/server.c @@ -1329,15 +1329,6 @@ server_accept(int sock, short et, void *d) connected_clients++; } -struct client * -client_by_id(int id) -{ - struct client find; - - find.id = id; - return SPLAY_FIND(client_tree_id, &clients, &find); -} - static void handle_siginfo(int fd, short ev, void *d) {