From 4761d51f387232446ede15ea990927f35d5f927e Mon Sep 17 00:00:00 2001 From: phk Date: Wed, 26 Sep 2007 18:56:18 +0000 Subject: [PATCH] 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 --- varnish-cache/bin/varnishd/cache.h | 8 ++++---- varnish-cache/bin/varnishd/cache_http.c | 2 +- varnish-cache/bin/varnishd/cache_pool.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/varnish-cache/bin/varnishd/cache.h b/varnish-cache/bin/varnishd/cache.h index c4f4ea66..92cf79eb 100644 --- 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 84113d17..bbb39e9e 100644 --- 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 f8ebfdcb..5948e6a9 100644 --- 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; -- 2.39.5