struct http_hdr is more than that, it is a general text handle, so

typedef it as "txt" instead.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2044 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/cache.h b/varnish-cache/bin/varnishd/cache.h
index c4f4ea668039e8f78e76c8780bda7f5b03224ba8..92cf79eb7561edbe57705a6ae9250ec3b9e682a7 100644 (file)
--- a/varnish-cache/bin/varnishd/cache.h
+++ b/varnish-cache/bin/varnishd/cache.h
@@ -102,10 +102,10 @@ char *WS_Alloc(struct ws *ws, unsigned bytes);
  * HTTP Request/Response/Header handling structure.
  */
 
-struct http_hdr {
+typedef struct {
        char                    *b;
        char                    *e;
-};
+} txt;
 
 enum httpwhence {
        HTTP_Rx,
@@ -124,7 +124,7 @@ struct http {
        unsigned char           conds;          /* If-* headers present */
        enum httpwhence         logtag;
 
-       struct http_hdr         hd[HTTP_HDR_MAX];
+       txt                     hd[HTTP_HDR_MAX];
        unsigned char           hdf[HTTP_HDR_MAX];
 #define HDF_FILTER             (1 << 0)        /* Filtered by Connection */
        unsigned                nhd;
@@ -493,7 +493,7 @@ void WRK_QueueSession(struct sess *sp);
 void WRK_Reset(struct worker *w, int *fd);
 unsigned WRK_Flush(struct worker *w);
 unsigned WRK_Write(struct worker *w, const void *ptr, int len);
-unsigned WRK_WriteH(struct worker *w, const struct http_hdr *hh, const char *suf);
+unsigned WRK_WriteH(struct worker *w, const txt *hh, const char *suf);
 #ifdef HAVE_SENDFILE
 void WRK_Sendfile(struct worker *w, int fd, off_t off, unsigned len);
 #endif  /* HAVE_SENDFILE */

diff --git a/varnish-cache/bin/varnishd/cache_http.c b/varnish-cache/bin/varnishd/cache_http.c
index 84113d1779a395522830dd64dc570c177e4ceb2a..bbb39e9e839dfc0dbf819d691204d7f3ec55ad1a 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_http.c
+++ b/varnish-cache/bin/varnishd/cache_http.c
@@ -174,7 +174,7 @@ http_Setup(struct http *hp, void *space, unsigned len)
 
 
 static int
-http_IsHdr(const struct http_hdr *hh, const char *hdr)
+http_IsHdr(const txt *hh, const char *hdr)
 {
        unsigned l;
 

diff --git a/varnish-cache/bin/varnishd/cache_pool.c b/varnish-cache/bin/varnishd/cache_pool.c
index f8ebfdcb9656d2fac714f9f0fd6f06b09eb6d0b5..5948e6a9e76de6b94f16ed7fa8e13cc2bb404dd7 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_pool.c
+++ b/varnish-cache/bin/varnishd/cache_pool.c
@@ -108,7 +108,7 @@ WRK_Flush(struct worker *w)
 }
 
 unsigned
-WRK_WriteH(struct worker *w, const struct http_hdr *hh, const char *suf)
+WRK_WriteH(struct worker *w, const txt *hh, const char *suf)
 {
        unsigned u;