r532 - in trunk/varnish-cache: bin/varnishd include

[phk at projects.linpro.no]

Author: phk
Date: 2006-07-21 09:18:40 +0200 (Fri, 21 Jul 2006)
New Revision: 532

Modified:
   trunk/varnish-cache/bin/varnishd/cache.h
   trunk/varnish-cache/bin/varnishd/cache_backend.c
   trunk/varnish-cache/bin/varnishd/cache_http.c
   trunk/varnish-cache/bin/varnishd/cache_session.c
   trunk/varnish-cache/bin/varnishd/cache_vrt.c
   trunk/varnish-cache/include/shmlog_tags.h
Log:
Rename shmlog tags for headers to RxHeader and TxHeader that's more
logical.

Rename http_Init() to http_Setup() to avoid clash with HTTP_Init().

Remove unused variable


Modified: trunk/varnish-cache/bin/varnishd/cache.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache.h	2006-07-20 22:08:43 UTC (rev 531)
+++ trunk/varnish-cache/bin/varnishd/cache.h	2006-07-21 07:18:40 UTC (rev 532)
@@ -296,7 +296,7 @@
 
 /* cache_http.c */
 void HTTP_Init(void);
-void http_Init(struct http *ht, void *space, unsigned len);
+void http_Setup(struct http *ht, void *space, unsigned len);
 int http_GetHdr(struct http *hp, const char *hdr, char **ptr);
 int http_GetHdrField(struct http *hp, const char *hdr, const char *field, char **ptr);
 int http_GetStatus(struct http *hp);

Modified: trunk/varnish-cache/bin/varnishd/cache_backend.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_backend.c	2006-07-20 22:08:43 UTC (rev 531)
+++ trunk/varnish-cache/bin/varnishd/cache_backend.c	2006-07-21 07:18:40 UTC (rev 532)
@@ -81,7 +81,7 @@
 	vbcm->vbe.magic = VBE_CONN_MAGIC;
 	vbcm->vbe.vbcm = vbcm;
 	vbcm->vbe.http = &vbcm->http;
-	http_Init(&vbcm->http, (void *)(vbcm + 1), heritage.mem_workspace);
+	http_Setup(&vbcm->http, (void *)(vbcm + 1), heritage.mem_workspace);
 	return (&vbcm->vbe);
 }
 

Modified: trunk/varnish-cache/bin/varnishd/cache_http.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_http.c	2006-07-20 22:08:43 UTC (rev 531)
+++ trunk/varnish-cache/bin/varnishd/cache_http.c	2006-07-21 07:18:40 UTC (rev 532)
@@ -25,7 +25,7 @@
 /*--------------------------------------------------------------------*/
 
 void
-http_Init(struct http *hp, void *space, unsigned len)
+http_Setup(struct http *hp, void *space, unsigned len)
 {
 	char *sp = space;
 
@@ -213,7 +213,7 @@
 		if (hp->nhd < MAX_HTTP_HDRS) {
 			hp->hd[hp->nhd][HTTP_START] = p;
 			hp->hd[hp->nhd][HTTP_END] = q;
-			VSLH(SLT_Header, fd, hp, hp->nhd);
+			VSLH(SLT_RxHeader, fd, hp, hp->nhd);
 			hp->nhd++;
 		} else {
 			VSL_stats->losthdr++;
@@ -526,7 +526,7 @@
 		if (http_supress(hp->hd[u][HTTP_START], sup))
 			continue;
 		if (1)
-			VSL(SLT_BldHdr, fd, "%s", hp->hd[u][HTTP_START]);
+			VSL(SLT_TxHeader, fd, "%s", hp->hd[u][HTTP_START]);
 		sbuf_cat(sb, hp->hd[u][HTTP_START]);
 		sbuf_cat(sb, "\r\n");
 	}

Modified: trunk/varnish-cache/bin/varnishd/cache_session.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_session.c	2006-07-20 22:08:43 UTC (rev 531)
+++ trunk/varnish-cache/bin/varnishd/cache_session.c	2006-07-21 07:18:40 UTC (rev 532)
@@ -178,7 +178,7 @@
 	sm->sess.magic = SESS_MAGIC;
 	sm->sess.mem = sm;
 	sm->sess.http = &sm->http;
-	http_Init(&sm->http, (void *)(sm + 1), heritage.mem_workspace);
+	http_Setup(&sm->http, (void *)(sm + 1), heritage.mem_workspace);
 	return (&sm->sess);
 }
 

Modified: trunk/varnish-cache/bin/varnishd/cache_vrt.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt.c	2006-07-20 22:08:43 UTC (rev 531)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt.c	2006-07-21 07:18:40 UTC (rev 532)
@@ -56,7 +56,6 @@
 char *
 VRT_GetReq(struct sess *sp)
 {
-	char *p;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	assert(sp != NULL);

Modified: trunk/varnish-cache/include/shmlog_tags.h
===================================================================
--- trunk/varnish-cache/include/shmlog_tags.h	2006-07-20 22:08:43 UTC (rev 531)
+++ trunk/varnish-cache/include/shmlog_tags.h	2006-07-21 07:18:40 UTC (rev 532)
@@ -29,8 +29,8 @@
 SLTM(Status)
 SLTM(URL)
 SLTM(Protocol)
-SLTM(Header)
-SLTM(BldHdr)
+SLTM(RxHeader)
+SLTM(TxHeader)
 SLTM(LostHeader)
 SLTM(VCL_call)
 SLTM(VCL_trace)