r1639 - trunk/varnish-cache/bin/varnishd

phk at projects.linpro.no phk at projects.linpro.no
Wed Jul 4 00:00:26 CEST 2007


Author: phk
Date: 2007-07-04 00:00:26 +0200 (Wed, 04 Jul 2007)
New Revision: 1639

Modified:
   trunk/varnish-cache/bin/varnishd/cache.h
   trunk/varnish-cache/bin/varnishd/cache_http.c
   trunk/varnish-cache/bin/varnishd/flint.lnt
Log:
Run FlexeLint to catch fluff.


Modified: trunk/varnish-cache/bin/varnishd/cache.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache.h	2007-07-03 21:50:31 UTC (rev 1638)
+++ trunk/varnish-cache/bin/varnishd/cache.h	2007-07-03 22:00:26 UTC (rev 1639)
@@ -166,10 +166,6 @@
 	struct srcaddr		*srcaddr;
 	struct acct		acct;
 
-	/* Backend connection space */
-	struct http		bereq[1];
-	struct http		beresp[1];
-
 	unsigned char		*wlp, *wle;
 	unsigned		wlr;
 	unsigned char		wlog[WLOGSPACE];
@@ -407,8 +403,6 @@
 void HTTP_Init(void);
 void http_ClrHeader(struct http *to);
 unsigned http_Write(struct worker *w, struct http *hp, int resp);
-void http_GetReq(struct http *to, struct http *fm);
-void http_CopyReq(struct http *to, struct http *fm);
 void http_CopyResp(struct http *to, struct http *fm);
 void http_SetResp(struct http *to, const char *proto, const char *status, const char *response);
 void http_FilterFields(struct worker *w, int fd, struct http *to, struct http *fm, unsigned how);

Modified: trunk/varnish-cache/bin/varnishd/cache_http.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_http.c	2007-07-03 21:50:31 UTC (rev 1638)
+++ trunk/varnish-cache/bin/varnishd/cache_http.c	2007-07-03 22:00:26 UTC (rev 1639)
@@ -702,8 +702,8 @@
 	to->hdf[n] = fm->hdf[n];
 }
 
-void
-http_GetReq(struct http *to, struct http *fm)
+static void
+http_getreq(struct http *to, struct http *fm)
 {
 
 	CHECK_OBJ_NOTNULL(fm, HTTP_MAGIC);
@@ -714,21 +714,6 @@
 }
 
 void
-http_CopyReq(struct http *to, struct http *fm)
-{
-
-	CHECK_OBJ_NOTNULL(fm, HTTP_MAGIC);
-	CHECK_OBJ_NOTNULL(to, HTTP_MAGIC);
-	http_copyh(to, fm, HTTP_HDR_REQ);
-	http_copyh(to, fm, HTTP_HDR_URL);
-	if (params->backend_http11)
-		http_seth(to, HTTP_HDR_PROTO, "HTTP/1.1");
-	else
-		http_copyh(to, fm, HTTP_HDR_PROTO);
-}
-
-
-void
 http_CopyResp(struct http *to, struct http *fm)
 {
 
@@ -806,7 +791,7 @@
         hp = bereq->http;
         hp->logtag = HTTP_Tx;
 
-	http_GetReq(hp, sp->http);
+	http_getreq(hp, sp->http);
 	http_FilterFields(sp->wrk, sp->fd, hp, sp->http, how);
 	http_PrintfHeader(sp->wrk, sp->fd, hp, "X-Varnish: %u", sp->xid);
 	http_PrintfHeader(sp->wrk, sp->fd, hp,

Modified: trunk/varnish-cache/bin/varnishd/flint.lnt
===================================================================
--- trunk/varnish-cache/bin/varnishd/flint.lnt	2007-07-03 21:50:31 UTC (rev 1638)
+++ trunk/varnish-cache/bin/varnishd/flint.lnt	2007-07-03 22:00:26 UTC (rev 1639)
@@ -41,8 +41,8 @@
 
 // cache_center.c
 -efunc(525, CNT_Session)	// Negative indentation from line
--efunc(525, http_FilterHeader)	// Negative indentation from line
--efunc(539, http_FilterHeader)	// Positive indentation from line
+-efunc(525, http_FilterFields)	// Negative indentation from line
+-efunc(539, http_FilterFields)	// Positive indentation from line
 
 // cache_vcl.c
 -efunc(525, vcl_handlingname)	// Negative indentation from line




More information about the varnish-commit mailing list