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

diff --git a/varnish-cache/bin/varnishd/cache.h b/varnish-cache/bin/varnishd/cache.h
index 1742927f2123ab132c9309e746fd18c2023f69ac..a1bc5fa3dfa2661afa24a002826784f061912400 100644 (file)
--- 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 a00881e87b7814089a53178d7f09c1aefd7ea5fb..fc29fa85da7120f6006a91fe6af1fd1d37a36f0f 100644 (file)
--- 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 dd660afe2f8af7d1397dc8d4f6a838085d910d82..731dccc544334c472acb9e94d6433f5f4f2fca13 100644 (file)
--- 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 57ee780d289625490059774eb75e34b7c0c8b6b4..52943633e0e921c1389d6e7f9cd729d445f8e980 100644 (file)
--- 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 9f711b654482d8cc09e2adf059879b680f4fb3c6..9aa02eb13c11477805bd89faa18fe92036b34382 100644 (file)
--- 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 38fc37f2b1f7bce039950af5d9125d204b441943..e481216eac5e7c66fee392cfb513859708b898bd 100644 (file)
--- 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)