Commit Diff


commit - 7c83689428d30bf646bea610ca4ee04aded74024
commit + 8aba5d8b210a17b49cfc8f02b12fd7b62c228fb3
blob - 9b4ee4af718198719b0833ddb76610cc946584d7
blob + d098fd49e28ad8ad84e85c33b8b02328539fdcc0
--- gmid.h
+++ 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 *);
blob - a570543b87a7001f839d3d67d13382d02fce2c94
blob + 577af2f5b6b171fdfd725b628edcbf82e4fe8a64
--- parse.y
+++ 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 *);
@@ -1204,16 +1202,6 @@ check_strip_no(int 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)
 {
 	if (n <= 0 || n >= PROC_MAX_INSTANCES)
@@ -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)
 {
blob - 748ac45be4c344acde2f1e7c5d3553c364f0d0d9
blob + ad66fee30f9cc24129e2a637ecf0138432a74516
--- server.c
+++ 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)
 {