From 9d725b02bf2c383a526422b6fb6474109d8d635b Mon Sep 17 00:00:00 2001
From: phk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Fri, 21 Jul 2006 07:18:40 +0000
Subject: [PATCH] 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


git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@532 d4fa192b-c00b-0410-8231-f00ffab90ce4
---
 varnish-cache/bin/varnishd/cache.h         | 2 +-
 varnish-cache/bin/varnishd/cache_backend.c | 2 +-
 varnish-cache/bin/varnishd/cache_http.c    | 6 +++---
 varnish-cache/bin/varnishd/cache_session.c | 2 +-
 varnish-cache/bin/varnishd/cache_vrt.c     | 1 -
 varnish-cache/include/shmlog_tags.h        | 4 ++--
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/varnish-cache/bin/varnishd/cache.h b/varnish-cache/bin/varnishd/cache.h
index 1742927f..a1bc5fa3 100644
--- a/varnish-cache/bin/varnishd/cache.h
+++ b/varnish-cache/bin/varnishd/cache.h
@@ -296,7 +296,7 @@ void HSH_Init(void);
 
 /* 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);
diff --git a/varnish-cache/bin/varnishd/cache_backend.c b/varnish-cache/bin/varnishd/cache_backend.c
index a00881e8..fc29fa85 100644
--- a/varnish-cache/bin/varnishd/cache_backend.c
+++ b/varnish-cache/bin/varnishd/cache_backend.c
@@ -81,7 +81,7 @@ vbe_new_conn(void)
 	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);
 }
 
diff --git a/varnish-cache/bin/varnishd/cache_http.c b/varnish-cache/bin/varnishd/cache_http.c
index dd660afe..731dccc5 100644
--- a/varnish-cache/bin/varnishd/cache_http.c
+++ b/varnish-cache/bin/varnishd/cache_http.c
@@ -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 @@ http_dissect_hdrs(struct http *hp, int fd, char *p)
 		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 @@ http_BuildSbuf(int fd, enum http_build mode, struct sbuf *sb, struct http *hp)
 		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");
 	}
diff --git a/varnish-cache/bin/varnishd/cache_session.c b/varnish-cache/bin/varnishd/cache_session.c
index 57ee780d..52943633 100644
--- a/varnish-cache/bin/varnishd/cache_session.c
+++ b/varnish-cache/bin/varnishd/cache_session.c
@@ -178,7 +178,7 @@ SES_New(struct sockaddr *addr, unsigned len)
 	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);
 }
 
diff --git a/varnish-cache/bin/varnishd/cache_vrt.c b/varnish-cache/bin/varnishd/cache_vrt.c
index 9f711b65..9aa02eb1 100644
--- a/varnish-cache/bin/varnishd/cache_vrt.c
+++ b/varnish-cache/bin/varnishd/cache_vrt.c
@@ -56,7 +56,6 @@ VRT_GetHdr(struct sess *sp, const char *n)
 char *
 VRT_GetReq(struct sess *sp)
 {
-	char *p;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	assert(sp != NULL);
diff --git a/varnish-cache/include/shmlog_tags.h b/varnish-cache/include/shmlog_tags.h
index 38fc37f2..e481216e 100644
--- a/varnish-cache/include/shmlog_tags.h
+++ b/varnish-cache/include/shmlog_tags.h
@@ -29,8 +29,8 @@ SLTM(Length)
 SLTM(Status)
 SLTM(URL)
 SLTM(Protocol)
-SLTM(Header)
-SLTM(BldHdr)
+SLTM(RxHeader)
+SLTM(TxHeader)
 SLTM(LostHeader)
 SLTM(VCL_call)
 SLTM(VCL_trace)
-- 
2.39.5