[master] f400cf1 Remove unused member of struct http_conn

Poul-Henning Kamp phk at FreeBSD.org
Mon Jul 14 21:24:59 CEST 2014


commit f400cf17452de872ded0e8f6682d843d6b2f6e0d
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Jul 14 19:22:17 2014 +0000

    Remove unused member of struct http_conn

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index ddb99a3..fe060dd 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -108,7 +108,6 @@ struct busyobj;
 struct cli;
 struct cli_proto;
 struct director;
-struct http_conn;
 struct iovec;
 struct mempool;
 struct objcore;
@@ -174,7 +173,7 @@ struct ws {
 };
 
 /*--------------------------------------------------------------------
- * 
+ *
  */
 
 struct http {
@@ -208,12 +207,9 @@ struct http {
  *
  */
 
-typedef ssize_t htc_read(struct http_conn *, void *, size_t);
-
 struct http_conn {
 	unsigned		magic;
 #define HTTP_CONN_MAGIC		0x3e19edd1
-	htc_read		*read;
 
 	int			fd;
 	struct vsl_log		*vsl;
diff --git a/bin/varnishd/cache/cache_http1_proto.c b/bin/varnishd/cache/cache_http1_proto.c
index 40af2cf..03563fd 100644
--- a/bin/varnishd/cache/cache_http1_proto.c
+++ b/bin/varnishd/cache/cache_http1_proto.c
@@ -72,7 +72,6 @@ HTTP1_Init(struct http_conn *htc, struct ws *ws, int fd, struct vsl_log *vsl,
 	htc->vsl = vsl;
 	htc->maxbytes = maxbytes;
 	htc->maxhdr = maxhdr;
-	htc->read = HTTP1_Read;
 
 	(void)WS_Reserve(htc->ws, htc->maxbytes);
 	htc->rxbuf.b = ws->f;



More information about the varnish-commit mailing list