r4358 - in trunk/varnish-cache: bin/varnishd bin/varnishstat bin/varnishtest bin/varnishtop include include/compat lib/libjemalloc lib/libvarnish lib/libvarnishcompat lib/libvcl
phk at projects.linpro.no
phk at projects.linpro.no
Thu Nov 19 20:03:26 CET 2009
Author: phk
Date: 2009-11-19 20:03:25 +0100 (Thu, 19 Nov 2009)
New Revision: 4358
Modified:
trunk/varnish-cache/bin/varnishd/cache.h
trunk/varnish-cache/bin/varnishd/cache_ban.c
trunk/varnish-cache/bin/varnishd/cache_ban.h
trunk/varnish-cache/bin/varnishd/cache_center.c
trunk/varnish-cache/bin/varnishd/cache_cli.c
trunk/varnish-cache/bin/varnishd/cache_esi.c
trunk/varnish-cache/bin/varnishd/cache_expire.c
trunk/varnish-cache/bin/varnishd/cache_fetch.c
trunk/varnish-cache/bin/varnishd/cache_hash.c
trunk/varnish-cache/bin/varnishd/cache_http.c
trunk/varnish-cache/bin/varnishd/cache_pool.c
trunk/varnish-cache/bin/varnishd/cache_response.c
trunk/varnish-cache/bin/varnishd/cache_session.c
trunk/varnish-cache/bin/varnishd/cache_vrt.c
trunk/varnish-cache/bin/varnishd/common.h
trunk/varnish-cache/bin/varnishd/hash_classic.c
trunk/varnish-cache/bin/varnishd/hash_critbit.c
trunk/varnish-cache/bin/varnishd/heritage.h
trunk/varnish-cache/bin/varnishd/mgt_child.c
trunk/varnish-cache/bin/varnishd/mgt_cli.c
trunk/varnish-cache/bin/varnishd/mgt_param.c
trunk/varnish-cache/bin/varnishd/mgt_vcc.c
trunk/varnish-cache/bin/varnishd/shmlog.c
trunk/varnish-cache/bin/varnishd/stevedore.c
trunk/varnish-cache/bin/varnishd/stevedore.h
trunk/varnish-cache/bin/varnishd/storage_persistent.c
trunk/varnish-cache/bin/varnishd/varnishd.c
trunk/varnish-cache/bin/varnishstat/varnishstat.c
trunk/varnish-cache/bin/varnishtest/vtc.c
trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
trunk/varnish-cache/bin/varnishtop/varnishtop.c
trunk/varnish-cache/include/cli.h
trunk/varnish-cache/include/compat/daemon.h
trunk/varnish-cache/include/http_headers.h
trunk/varnish-cache/include/libvarnish.h
trunk/varnish-cache/include/persistent.h
trunk/varnish-cache/include/purge_vars.h
trunk/varnish-cache/include/stat_field.h
trunk/varnish-cache/include/vqueue.h
trunk/varnish-cache/lib/libjemalloc/jemalloc_linux.c
trunk/varnish-cache/lib/libvarnish/binary_heap.c
trunk/varnish-cache/lib/libvarnish/subproc.c
trunk/varnish-cache/lib/libvarnish/tcp.c
trunk/varnish-cache/lib/libvarnish/vlu.c
trunk/varnish-cache/lib/libvarnish/vsha256.c
trunk/varnish-cache/lib/libvarnishcompat/execinfo.c
trunk/varnish-cache/lib/libvcl/vcc_acl.c
trunk/varnish-cache/lib/libvcl/vcc_action.c
trunk/varnish-cache/lib/libvcl/vcc_backend.c
trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c
trunk/varnish-cache/lib/libvcl/vcc_gen_fixed_token.tcl
trunk/varnish-cache/lib/libvcl/vcc_obj.c
trunk/varnish-cache/lib/libvcl/vcc_xref.c
Log:
White-space cleanup megacommit.
Modified: trunk/varnish-cache/bin/varnishd/cache.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache.h 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/cache.h 2009-11-19 19:03:25 UTC (rev 4358)
@@ -284,7 +284,7 @@
struct object *obj;
struct objhead *objhead;
double timer_when;
- unsigned flags;
+ unsigned flags;
#define OC_F_ONLRU (1<<0)
#define OC_F_BUSY (1<<1)
#define OC_F_PASS (1<<2)
@@ -472,7 +472,8 @@
/* cache_ban.c */
struct ban *BAN_New(void);
-int BAN_AddTest(struct cli *, struct ban *, const char *, const char *, const char *);
+int BAN_AddTest(struct cli *, struct ban *, const char *, const char *,
+ const char *);
void BAN_Free(struct ban *b);
void BAN_Insert(struct ban *b);
void BAN_Init(void);
@@ -607,7 +608,8 @@
#endif /* SENDFILE_WORKS */
typedef void *bgthread_t(struct sess *, void *priv);
-void WRK_BgThread(pthread_t *thr, const char *name, bgthread_t *func, void *priv);
+void WRK_BgThread(pthread_t *thr, const char *name, bgthread_t *func,
+ void *priv);
/* cache_session.c [SES] */
void SES_Init(void);
Modified: trunk/varnish-cache/bin/varnishd/cache_ban.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_ban.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/cache_ban.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -35,7 +35,7 @@
* req.url ~ ".iso" && obj.size > 10MB
* req.http.host ~ "web1.com" && obj.set-cookie ~ "USER=29293"
*
- * We make the "&&" mandatory from the start, leaving the syntax space
+ * We make the "&&" mandatory from the start, leaving the syntax space
* for latter handling of "||" as well.
*
*/
@@ -243,7 +243,8 @@
};
int
-BAN_AddTest(struct cli *cli, struct ban *b, const char *a1, const char *a2, const char *a3)
+BAN_AddTest(struct cli *cli, struct ban *b, const char *a1, const char *a2,
+ const char *a3)
{
struct ban_test *bt;
const struct pvar *pv;
@@ -289,7 +290,7 @@
bt->func = pv->func;
if (pv->flag & PVAR_REQ)
b->flags |= BAN_F_REQ;
- if (pv->flag & PVAR_HTTP)
+ if (pv->flag & PVAR_HTTP)
ban_parse_http(bt, a1 + strlen(pv->name));
break;
}
@@ -531,7 +532,7 @@
oc = NULL;
while (1) {
b = VTAILQ_LAST(&ban_head, banhead);
- if (b == ban_start)
+ if (b == ban_start)
break;
oc = VTAILQ_FIRST(&b->objcore);
if (oc == NULL)
Modified: trunk/varnish-cache/bin/varnishd/cache_ban.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_ban.h 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/cache_ban.h 2009-11-19 19:03:25 UTC (rev 4358)
@@ -33,7 +33,8 @@
struct ban_test;
/* A ban-testing function */
-typedef int ban_cond_f(const struct ban_test *bt, const struct object *o, const struct sess *sp);
+typedef int ban_cond_f(const struct ban_test *bt, const struct object *o,
+ const struct sess *sp);
/* Each individual test to be performed on a ban */
struct ban_test {
Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -123,7 +123,7 @@
else if (i == -1 && Tlen(sp->htc->rxbuf) == 0 &&
(errno == 0 || errno == ECONNRESET))
vca_close_session(sp, "EOF");
- else
+ else
vca_close_session(sp, "error");
sp->step = STP_DONE;
}
@@ -256,7 +256,7 @@
sp->t_resp = NAN;
WSL_Flush(sp->wrk, 0);
- /* If we did an ESI include, don't mess up our state */
+ /* If we did an ESI include, don't mess up our state */
if (sp->esis > 0) {
SES_Charge(sp);
return (1);
@@ -266,7 +266,7 @@
if (sp->fd >= 0 && sp->doclose != NULL) {
/*
- * This is an orderly close of the connection; ditch nolinger
+ * This is an orderly close of the connection; ditch nolinger
* before we close, to get queued data transmitted.
*/
TCP_linger(sp->fd, 0);
@@ -282,7 +282,7 @@
return (1);
}
- if (sp->wrk->stats.client_req >= params->wthread_stats_rate)
+ if (sp->wrk->stats.client_req >= params->wthread_stats_rate)
WRK_SumStat(sp->wrk);
/* Reset the workspace to the session-watermark */
WS_Reset(sp->ws, sp->ws_ses);
@@ -361,7 +361,8 @@
http_StatusMessage(sp->err_code));
VCL_error_method(sp);
- if (sp->handling == VCL_RET_RESTART && sp->restarts < params->max_restarts) {
+ if (sp->handling == VCL_RET_RESTART &&
+ sp->restarts < params->max_restarts) {
HSH_Drop(sp);
sp->director = NULL;
sp->restarts++;
@@ -369,8 +370,8 @@
return (0);
} else if (sp->handling == VCL_RET_RESTART)
sp->handling = VCL_RET_DELIVER;
-
+
/* We always close when we take this path */
sp->doclose = "error";
sp->wantbody = 1;
@@ -534,7 +535,7 @@
/*
* XXX: If we have a Length: header, we should allocate the body
* XXX: also.
- */
+ */
sp->obj = STV_NewObject(sp, l, sp->wrk->ttl);
@@ -563,7 +564,7 @@
sp->obj->cacheable = sp->wrk->cacheable;
sp->obj->ttl = sp->wrk->ttl;
sp->obj->grace = sp->wrk->grace;
- if (sp->obj->ttl == 0. && sp->obj->grace == 0.)
+ if (sp->obj->ttl == 0. && sp->obj->grace == 0.)
sp->obj->cacheable = 0;
sp->obj->age = sp->wrk->age;
sp->obj->entered = sp->wrk->entered;
@@ -580,7 +581,7 @@
if (http_GetHdr(hp, H_Last_Modified, &b))
sp->obj->last_modified = TIM_parse(b);
-
+
i = FetchBody(sp);
AZ(sp->wrk->wfd);
AZ(sp->vbe);
@@ -614,7 +615,7 @@
sp->step = STP_RECV;
return (0);
case VCL_RET_PASS:
- if (sp->obj->objcore != NULL)
+ if (sp->obj->objcore != NULL)
sp->obj->objcore->flags |= OC_F_PASS;
if (sp->obj->ttl - sp->t_req < params->default_ttl)
sp->obj->ttl = sp->t_req + params->default_ttl;
@@ -1026,8 +1027,8 @@
sp->director = sp->vcl->director[0];
AN(sp->director);
- sp->disable_esi = 0;
-
+ sp->disable_esi = 0;
+
VCL_recv_method(sp);
if (sp->restarts >= params->max_restarts) {
if (sp->err_code == 0)
Modified: trunk/varnish-cache/bin/varnishd/cache_cli.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_cli.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/cache_cli.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -224,7 +224,7 @@
static void
ccf_panic(struct cli *cli, const char * const *av, void *priv)
-{
+{
(void)cli;
(void)av;
Modified: trunk/varnish-cache/bin/varnishd/cache_esi.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_esi.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/cache_esi.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -111,7 +111,7 @@
if (ep->p == finis)
return;
ep->p++;
- if (ep->p < (char*)ep->st->ptr + ep->st->len)
+ if (ep->p < (char*)ep->st->ptr + ep->st->len)
return;
ep->st = VTAILQ_NEXT(ep->st, list);
if (ep->st != NULL) {
@@ -605,7 +605,7 @@
ll = Tlen(ew->tag);
ew->tag.b++;
ew->tag.e--;
- empty = (ew->tag.e[-1] == '/') ? 1 : 0;
+ empty = (ew->tag.e[-1] == '/') ? 1 : 0;
if (empty)
ew->tag.e--;
@@ -648,7 +648,7 @@
} else if (!empty) {
esi_error(ew, ew->s.p, ll,
"ESI 1.0 wants empty esi:include");
- }
+ }
ew->tag.b += 7;
esi_handle_include(ew);
} else {
@@ -712,7 +712,7 @@
AN(ew->p.st);
ew->p.p = (char *)ew->p.st->ptr;
ew->p.e = ew->p.p + ew->p.st->len;
-
+
/* ->s points to the first un-dealt-with byte */
ew->s = ew->p;
Modified: trunk/varnish-cache/bin/varnishd/cache_expire.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_expire.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/cache_expire.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -287,7 +287,7 @@
if (oc->flags & OC_F_ONLRU) {
VLIST_REMOVE(oc, lru_list);
oc->flags &= ~OC_F_ONLRU;
- }
+ }
VSL_stats->n_expired++;
Modified: trunk/varnish-cache/bin/varnishd/cache_fetch.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_fetch.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/cache_fetch.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -247,7 +247,8 @@
if (v == 0) {
if (st != NULL && fetchfrag > 0)
dump_st(sp, st);
- st = STV_alloc(sp, params->fetch_chunksize * 1024LL, NULL);
+ st = STV_alloc(sp, params->fetch_chunksize * 1024LL,
+ NULL);
VTAILQ_INSERT_TAIL(&sp->obj->store, st, list);
p = st->ptr + st->len;
v = st->space - st->len;
@@ -486,7 +487,7 @@
sp->wrk->stats.fetch_zero++;
/*
* Assume zero length
- * XXX: ???
+ * XXX: ???
*/
mklen = 1;
}
@@ -518,7 +519,7 @@
http_PrintfHeader(sp->wrk, sp->fd, sp->obj->http,
"Content-Length: %u", sp->obj->len);
- if (http_HdrIs(hp, H_Connection, "close"))
+ if (http_HdrIs(hp, H_Connection, "close"))
cls = 1;
if (cls)
Modified: trunk/varnish-cache/bin/varnishd/cache_hash.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_hash.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/cache_hash.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -320,7 +320,7 @@
for (i = 0; i < nused; i++)
if (!memcmp(hsh_magiclist[i].was, result, SHA256_LEN))
break;
- if (i == nused && i < HSH_NMAGIC)
+ if (i == nused && i < HSH_NMAGIC)
memcpy(hsh_magiclist[nused++].was, result, SHA256_LEN);
if (i == nused)
return;
@@ -355,7 +355,7 @@
HSH_Prealloc(sp);
if (params->diag_bitmap & 0x80000000)
hsh_testmagic(sp->wrk->nobjhead->digest);
-
+
AZ(sp->objhead);
AN(w->nobjhead);
oh = hash->lookup(sp, w->nobjhead);
@@ -399,7 +399,7 @@
HSH_Prealloc(sp);
if (params->diag_bitmap & 0x80000000)
hsh_testmagic(sp->wrk->nobjhead->digest);
-
+
if (sp->objhead != NULL) {
CHECK_OBJ_NOTNULL(sp->objhead, OBJHEAD_MAGIC);
oh = sp->objhead;
@@ -432,12 +432,12 @@
o = oc->obj;
CHECK_OBJ_NOTNULL(o, OBJECT_MAGIC);
-
+
if (!o->cacheable)
continue;
if (o->ttl == 0)
continue;
- if (BAN_CheckObject(o, sp))
+ if (BAN_CheckObject(o, sp))
continue;
if (o->vary != NULL && !VRY_Match(sp, o->vary))
continue;
@@ -465,7 +465,7 @@
* set here? FIXME:Grace.
*/
sp->objhead = oh;
- if (oc == NULL && grace_oc != NULL &&
+ if (oc == NULL && grace_oc != NULL &&
(busy_oc != NULL || !sp->director->healthy(sp))) {
o = grace_oc->obj;
CHECK_OBJ_NOTNULL(o, OBJECT_MAGIC);
@@ -629,7 +629,7 @@
/*******************************************************************
* This one is slightly tricky. This is called from the BAN module
* to try to wash the object which holds the oldest ban.
- * We compete against HSH_Deref() which comes in the opposite
+ * We compete against HSH_Deref() which comes in the opposite
* locking order, we need to hold the BAN mutex, to stop the
* BAN_DestroyObj() call in HSH_Deref(), so that the objhead
* will not be removed under us.
@@ -680,12 +680,12 @@
CHECK_OBJ_NOTNULL(oc, OBJCORE_MAGIC);
oh = oc->objhead;
CHECK_OBJ_NOTNULL(oh, OBJHEAD_MAGIC);
-
+
Lck_Lock(&oh->mtx);
assert(oh->refcnt > 0);
assert(o->refcnt > 0);
r = --o->refcnt;
- if (!r)
+ if (!r)
VTAILQ_REMOVE(&oh->objcs, oc, list);
hsh_rush(oh);
Lck_Unlock(&oh->mtx);
Modified: trunk/varnish-cache/bin/varnishd/cache_http.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_http.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/cache_http.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -153,7 +153,7 @@
for (u = HTTP_HDR_FIRST; u < hp->nhd; u++) {
/* XXX We have to check for empty header entries
- because a header could have been lost in
+ because a header could have been lost in
http_copyHome */
if (hp->hd[u].b == NULL)
continue;
@@ -629,7 +629,7 @@
* to 'how'.
*/
-unsigned
+unsigned
http_EstimateWS(const struct http *fm, unsigned how)
{
unsigned u, l;
Modified: trunk/varnish-cache/bin/varnishd/cache_pool.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_pool.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/cache_pool.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -476,9 +476,9 @@
wrk_herder_thread(void *priv)
{
unsigned u, w;
- pthread_attr_t tp_attr;
+ pthread_attr_t tp_attr;
- /* Set the stacksize for worker threads */
+ /* Set the stacksize for worker threads */
AZ(pthread_attr_init(&tp_attr));
THR_SetName("wrk_herder");
@@ -487,7 +487,7 @@
for (u = 0 ; u < nwq; u++) {
if (params->wthread_stacksize != UINT_MAX)
AZ(pthread_attr_setstacksize(&tp_attr,
- params->wthread_stacksize));
+ params->wthread_stacksize));
wrk_breed_flock(wq[u], &tp_attr);
Modified: trunk/varnish-cache/bin/varnishd/cache_response.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_response.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/cache_response.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -57,23 +57,30 @@
TIM_format(sp->t_req, lm);
http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp, "Date: %s", lm);
http_SetHeader(sp->wrk, sp->fd, sp->wrk->resp, "Via: 1.1 varnish");
- http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp, "X-Varnish: %u", sp->xid);
+ http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp,
+ "X-Varnish: %u", sp->xid);
if (sp->obj->last_modified) {
TIM_format(sp->obj->last_modified, lm);
- http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp, "Last-Modified: %s", lm);
+ http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp,
+ "Last-Modified: %s", lm);
}
/* http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.3.5 */
if (http_GetHdr(sp->obj->http, H_Cache_Control, &p))
- http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp, "Cache-Control: %s", p);
+ http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp,
+ "Cache-Control: %s", p);
if (http_GetHdr(sp->obj->http, H_Content_Location, &p))
- http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp, "Content-Location: %s", p);
+ http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp,
+ "Content-Location: %s", p);
if (http_GetHdr(sp->obj->http, H_ETag, &p))
- http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp, "ETag: %s", p);
+ http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp,
+ "ETag: %s", p);
if (http_GetHdr(sp->obj->http, H_Expires, &p))
- http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp, "Expires: %s", p);
+ http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp,
+ "Expires: %s", p);
if (http_GetHdr(sp->obj->http, H_Vary, &p))
- http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp, "Vary: %s", p);
+ http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp,
+ "Vary: %s", p);
http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp, "Connection: %s",
sp->doclose ? "close" : "keep-alive");
@@ -111,7 +118,7 @@
do_cond = 1;
}
- if (do_cond == 1) {
+ if (do_cond == 1) {
res_do_304(sp);
return (1);
}
@@ -142,7 +149,8 @@
if (!sp->disable_esi && sp->obj->esidata != NULL) {
http_Unset(sp->wrk->resp, H_Content_Length);
if(sp->http->protover >= 1.1)
- http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp, "Transfer-Encoding: chunked");
+ http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp,
+ "Transfer-Encoding: chunked");
}
TIM_format(TIM_real(), time_str);
Modified: trunk/varnish-cache/bin/varnishd/cache_session.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_session.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/cache_session.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -76,7 +76,7 @@
/*--------------------------------------------------------------------*/
-static struct lock stat_mtx;
+static struct lock stat_mtx;
/*--------------------------------------------------------------------*/
@@ -86,7 +86,7 @@
struct acct *a = &sp->acct_req;
#define ACCT(foo) \
- sp->wrk->stats.s_##foo += a->foo; \
+ sp->wrk->stats.s_##foo += a->foo; \
sp->acct.foo += a->foo; \
a->foo = 0;
#include "acct_fields.h"
@@ -135,7 +135,7 @@
sp->t_end = NAN;
sp->grace = NAN;
sp->disable_esi = 0;
-
+
assert(len <= sp->sockaddrlen);
if (addr != NULL) {
memcpy(sp->sockaddr, addr, len);
@@ -252,15 +252,15 @@
AN(sp->vbe->backend);
be = sp->vbe->backend;
- /*
+ /*
* We only inherit the backend's timeout if the session timeout
* has not already been set in the VCL, as the order of precedence
* is parameter < backend definition < VCL.
*/
- if (be->connect_timeout > 1e-3 &&
+ if (be->connect_timeout > 1e-3 &&
sp->connect_timeout == params->connect_timeout)
sp->connect_timeout = be->connect_timeout;
- if (be->first_byte_timeout > 1e-3 &&
+ if (be->first_byte_timeout > 1e-3 &&
sp->first_byte_timeout == params->first_byte_timeout)
sp->first_byte_timeout = be->first_byte_timeout;
if (be->between_bytes_timeout > 1e-3 &&
Modified: trunk/varnish-cache/bin/varnishd/cache_vrt.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -67,7 +67,7 @@
{
CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
- WSL(sp->wrk, SLT_Debug, 0, "VCL_error(%u, %s)", code, reason ?
+ WSL(sp->wrk, SLT_Debug, 0, "VCL_error(%u, %s)", code, reason ?
reason : "(null)");
sp->err_code = code ? code : 503;
sp->err_reason = reason ? reason : http_StatusMessage(sp->err_code);
@@ -281,7 +281,7 @@
/* Add an objecthead to the saintmode list for the (hopefully) relevant
* backend. Some double-up asserting here to avoid assert-errors when there
- * is no object.
+ * is no object.
*/
void
VRT_l_beresp_saintmode(const struct sess *sp, double a)
@@ -305,7 +305,7 @@
* when compiling the VCL would be better.
*/
assert(a > 0);
-
+
ALLOC_OBJ(new, TROUBLE_MAGIC);
AN(new);
new->objhead = sp->objhead;
@@ -314,7 +314,7 @@
/* Insert the new item on the list before the first item with a
* timeout at a later date (ie: sort by which entry will time out
* from the list
- */
+ */
Lck_Lock(&sp->vbe->backend->mtx);
VTAILQ_FOREACH_SAFE(tr, &sp->vbe->backend->troublelist, list, tr2) {
if (tr->timeout < new->timeout) {
@@ -329,7 +329,7 @@
*/
if (new)
VTAILQ_INSERT_TAIL(&sp->vbe->backend->troublelist, new, list);
-
+
Lck_Unlock(&sp->vbe->backend->mtx);
}
@@ -708,7 +708,7 @@
if (heritage.identity[0] != '\0')
return heritage.identity;
- else
+ else
return heritage.name;
}
@@ -720,7 +720,7 @@
if (vrt_hostname[0] == '\0')
AZ(gethostname(vrt_hostname, 255));
-
+
return (vrt_hostname);
}
@@ -965,7 +965,7 @@
a1 = va_arg(ap, char *);
good = 1;
}
- if (!good)
+ if (!good)
/* XXX: report error how ? */
BAN_Free(b);
else
@@ -1018,7 +1018,7 @@
if (strcmp(av[i++], "&&"))
break;
}
- if (!good)
+ if (!good)
/* XXX: report error how ? */
BAN_Free(b);
else
Modified: trunk/varnish-cache/bin/varnishd/common.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/common.h 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/common.h 2009-11-19 19:03:25 UTC (rev 4358)
@@ -65,4 +65,4 @@
void *ptr;
};
-#define NEEDLESS_RETURN(foo) return (foo)
+#define NEEDLESS_RETURN(foo) return (foo)
Modified: trunk/varnish-cache/bin/varnishd/hash_classic.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/hash_classic.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/hash_classic.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -173,7 +173,7 @@
if (--oh->refcnt == 0) {
VTAILQ_REMOVE(&hp->head, oh, hoh_list);
ret = 0;
- } else
+ } else
ret = 1;
Lck_Unlock(&hp->mtx);
return (ret);
Modified: trunk/varnish-cache/bin/varnishd/hash_critbit.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/hash_critbit.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/hash_critbit.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -51,10 +51,10 @@
/**********************************************************************
* Table for finding out how many bits two bytes have in common,
* counting from the MSB towards the LSB.
- * ie:
+ * ie:
* hcb_bittbl[0x01 ^ 0x22] == 2
* hcb_bittbl[0x10 ^ 0x0b] == 3
- *
+ *
*/
static unsigned char hcb_bittbl[256];
@@ -163,7 +163,8 @@
/**********************************************************************/
static unsigned
-hcb_crit_bit(const struct objhead *oh1, const struct objhead *oh2, struct hcb_y *y)
+hcb_crit_bit(const struct objhead *oh1, const struct objhead *oh2,
+ struct hcb_y *y)
{
unsigned char u, r;
@@ -264,7 +265,7 @@
}
p = &r->origo;
assert(hcb_is_y(*p));
-
+
y = NULL;
while(1) {
assert(hcb_is_y(*p));
@@ -422,7 +423,7 @@
{
struct objhead *oh;
unsigned u;
-
+
oh = hcb_insert(&hcb_root, noh, 0);
if (oh != NULL) {
/* Assert that we didn't muck with the tree without lock */
Modified: trunk/varnish-cache/bin/varnishd/heritage.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/heritage.h 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/heritage.h 2009-11-19 19:03:25 UTC (rev 4358)
@@ -159,7 +159,7 @@
/* Read timeouts for backend */
double first_byte_timeout;
- double between_bytes_timeout;
+ double between_bytes_timeout;
/* How long to linger on sessions */
unsigned session_linger;
Modified: trunk/varnish-cache/bin/varnishd/mgt_child.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_child.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/mgt_child.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -546,7 +546,7 @@
start_child(NULL);
if (child_state == CH_STOPPED)
exit(2);
- }
+ }
i = vev_schedule(mgt_evb);
if (i != 0)
Modified: trunk/varnish-cache/bin/varnishd/mgt_cli.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_cli.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/mgt_cli.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -326,7 +326,7 @@
}
cp->challenge[0] = '\0';
cli_result(cli, CLIS_OK);
- if (params->cli_banner)
+ if (params->cli_banner)
mcf_banner(cli, av, priv);
}
@@ -379,11 +379,11 @@
if (secret_file != NULL && cp->challenge[0] != '\0') {
/* Authentication not yet passed */
cli_dispatch(cp->cli, cli_auth, p);
- if (cp->cli->result == CLIS_UNKNOWN)
+ if (cp->cli->result == CLIS_UNKNOWN)
mgt_cli_challenge(cp);
} else {
cli_dispatch(cp->cli, cli_proto, p);
- if (cp->cli->result == CLIS_UNKNOWN)
+ if (cp->cli->result == CLIS_UNKNOWN)
cli_dispatch(cp->cli, cli_debug, p);
if (cp->cli->result == CLIS_UNKNOWN) {
/*
Modified: trunk/varnish-cache/bin/varnishd/mgt_param.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_param.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/mgt_param.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -68,7 +68,7 @@
int i;
for (i = 0; i < nparspec; i++)
- if (!strcmp(parspec[i]->name, name))
+ if (!strcmp(parspec[i]->name, name))
return (parspec[i]);
return (NULL);
}
@@ -93,7 +93,8 @@
}
static void
-tweak_generic_timeout_double(struct cli *cli, volatile double *dst, const char *arg)
+tweak_generic_timeout_double(struct cli *cli, volatile double *dst,
+ const char *arg)
{
double u;
@@ -123,7 +124,8 @@
}
static void
-tweak_timeout_double(struct cli *cli, const struct parspec *par, const char *arg)
+tweak_timeout_double(struct cli *cli, const struct parspec *par,
+ const char *arg)
{
volatile double *dest;
@@ -646,18 +648,20 @@
&master.first_byte_timeout,0, UINT_MAX,
"Default timeout for receiving first byte from backend. "
"We only wait for this many seconds for the first "
- "byte before giving up. A value of 0 means it will never time out. "
+ "byte before giving up. A value of 0 means it will never time "
+ "out. "
"VCL can override this default value for each backend and "
"backend request. This parameter does not apply to pipe.",
0,
"60", "s" },
{ "between_bytes_timeout", tweak_timeout_double,
&master.between_bytes_timeout,0, UINT_MAX,
- "Default timeout between bytes when receiving data from backend. "
+ "Default timeout between bytes when receiving data from "
+ "backend. "
"We only wait for this many seconds between bytes "
"before giving up. A value of 0 means it will never time out. "
- "VCL can override this default value for each backend request and "
- "backend request. This parameter does not apply to pipe.",
+ "VCL can override this default value for each backend request "
+ "and backend request. This parameter does not apply to pipe.",
0,
"60", "s" },
{ "accept_fd_holdoff", tweak_timeout,
@@ -765,12 +769,13 @@
"A value of zero disables the ban lurker.",
0,
"0.0", "s" },
- { "saintmode_threshold", tweak_uint, &master.saintmode_threshold, 0, UINT_MAX,
- "The maximum number of objects held off by saint mode before no further "
- "will be made to the backend until one times out. A value of 0 disables "
- "saintmode.",
+ { "saintmode_threshold", tweak_uint,
+ &master.saintmode_threshold, 0, UINT_MAX,
+ "The maximum number of objects held off by saint mode before "
+ "no further will be made to the backend until one times out. "
+ "A value of 0 disables saintmode.",
EXPERIMENTAL,
- "10", "objects" },
+ "10", "objects" },
{ NULL, NULL, NULL }
};
Modified: trunk/varnish-cache/bin/varnishd/mgt_vcc.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_vcc.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/mgt_vcc.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -373,7 +373,7 @@
fprintf(stderr, "%s", vsb_data(sb));
vsb_delete(sb);
if (C_flag) {
- if (vf != NULL)
+ if (vf != NULL)
AZ(unlink(vf));
return (0);
}
Modified: trunk/varnish-cache/bin/varnishd/shmlog.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/shmlog.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/shmlog.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -285,7 +285,7 @@
void
VSL_Panic(int *len, char **ptr)
{
- static char a[1] = { '\0' };
+ static char a[1] = { '\0' };
AN(len);
AN(ptr);
Modified: trunk/varnish-cache/bin/varnishd/stevedore.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/stevedore.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/stevedore.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -48,7 +48,7 @@
* NB! Dirty trick alert:
*
* We use a captive objcore as tail senteniel for LRU lists, but to
- * make sure it does not get into play by accident, we do _not_
+ * make sure it does not get into play by accident, we do _not_
* initialize its magic with OBJCORE_MAGIC.
*
*/
@@ -125,7 +125,7 @@
XXXAN(o);
STV_InitObj(sp, o, l);
return (o);
- }
+ }
st = STV_alloc(sp, sizeof *o + l, sp->objcore);
XXXAN(st);
xxxassert(st->space >= (sizeof *o + l));
Modified: trunk/varnish-cache/bin/varnishd/stevedore.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/stevedore.h 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/stevedore.h 2009-11-19 19:03:25 UTC (rev 4358)
@@ -37,8 +37,10 @@
typedef void storage_init_f(struct stevedore *, int ac, char * const *av);
typedef void storage_open_f(const struct stevedore *);
-typedef struct storage *storage_alloc_f(struct stevedore *, size_t size, struct objcore *);
-typedef struct object *storage_alloc_obj_f(struct stevedore *, size_t size, double ttl);
+typedef struct storage *storage_alloc_f(struct stevedore *, size_t size,
+ struct objcore *);
+typedef struct object *storage_alloc_obj_f(struct stevedore *, size_t size,
+ double ttl);
typedef void storage_trim_f(struct storage *, size_t size);
typedef void storage_free_f(struct storage *);
typedef void storage_object_f(const struct sess *sp);
@@ -78,7 +80,8 @@
struct lru *LRU_Alloc(void);
int STV_GetFile(const char *fn, int *fdp, const char **fnp, const char *ctx);
-uintmax_t STV_FileSize(int fd, const char *size, unsigned *granularity, const char *ctx);
+uintmax_t STV_FileSize(int fd, const char *size, unsigned *granularity,
+ const char *ctx);
/* Synthetic Storage */
void SMS_Init(void);
Modified: trunk/varnish-cache/bin/varnishd/storage_persistent.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/storage_persistent.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/storage_persistent.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -65,7 +65,7 @@
#define ASSERT_SILO_THREAD(sc) \
do {assert(pthread_self() == (sc)->thread);} while (0)
-#define RDN2(x, y) ((x)&(~((y)-1))) /* if y is powers of two */
+#define RDN2(x, y) ((x)&(~((y)-1))) /* if y is powers of two */
#define RUP2(x, y) (((x)+((y)-1))&(~((y)-1))) /* if y is powers of two */
/*
@@ -118,7 +118,7 @@
struct smp_sc {
unsigned magic;
-#define SMP_SC_MAGIC 0x7b73af0a
+#define SMP_SC_MAGIC 0x7b73af0a
struct stevedore *parent;
unsigned flags;
@@ -177,7 +177,7 @@
#define SEG_SPACE RUP2(SMP_SIGN_SPACE, CACHE_LINE_ALIGN)
/*
- * silos is unlocked, it only changes during startup when we are
+ * silos is unlocked, it only changes during startup when we are
* single-threaded
*/
static VTAILQ_HEAD(,smp_sc) silos = VTAILQ_HEAD_INITIALIZER(silos);
@@ -199,7 +199,8 @@
*/
static void
-smp_def_sign(const struct smp_sc *sc, struct smp_signctx *ctx, uint64_t off, const char *id)
+smp_def_sign(const struct smp_sc *sc, struct smp_signctx *ctx,
+ uint64_t off, const char *id)
{
AZ(off & 7); /* Alignment */
@@ -237,7 +238,7 @@
SHA256_Final(sign, &cx);
if (memcmp(sign, SIGN_END(ctx), sizeof sign))
r = 4;
- }
+ }
if (r) {
fprintf(stderr, "CHK(%p %s %p %s) = %d\n",
ctx, ctx->id, ctx->ss,
@@ -305,7 +306,8 @@
*/
static void
-smp_new_sign(const struct smp_sc *sc, struct smp_signctx *ctx, uint64_t off, const char *id)
+smp_new_sign(const struct smp_sc *sc, struct smp_signctx *ctx,
+ uint64_t off, const char *id)
{
smp_def_sign(sc, ctx, off, id);
smp_reset_sign(ctx);
@@ -526,7 +528,7 @@
{
struct smp_sc *sc;
int i;
-
+
ASSERT_MGT();
AZ(av[ac]);
@@ -685,10 +687,11 @@
*/
static void
-smp_appendban(struct smp_sc *sc, struct smp_signctx *ctx, double t0, uint32_t flags, uint32_t len, const char *ban)
+smp_appendban(struct smp_sc *sc, struct smp_signctx *ctx, double t0,
+ uint32_t flags, uint32_t len, const char *ban)
{
uint8_t *ptr, *ptr2;
-
+
(void)sc;
ptr = ptr2 = SIGN_END(ctx);
@@ -736,7 +739,7 @@
ASSERT_CLI();
(void)sc;
- i = smp_chk_sign(ctx);
+ i = smp_chk_sign(ctx);
if (i)
return (i);
ptr = SIGN_DATA(ctx);
@@ -935,7 +938,7 @@
int i, n = 0;
ASSERT_CLI();
- i = smp_chk_sign(ctx);
+ i = smp_chk_sign(ctx);
if (i)
return (i);
@@ -960,7 +963,7 @@
l = sc->mediasize - sc->free_offset;
if (se->offset > ss->offset && l >= sc->free_reserve) {
/*
- * [__xxxxyyyyzzzz___]
+ * [__xxxxyyyyzzzz___]
* Plenty of space at tail, do nothing.
*/
//printf("TRS: %jx @ %jx\n", l, sc->free_offset);
@@ -985,7 +988,7 @@
if (l < sc->free_reserve) {
/*
- * [__xxxxyyyyzzzz___]
+ * [__xxxxyyyyzzzz___]
* (make) space at front
*/
sc->free_offset = sc->ident->stuff[SMP_SPC_STUFF];
@@ -1208,7 +1211,7 @@
BAN_Deref(&sc->tailban);
sc->tailban = NULL;
printf("Silo completely loaded\n");
- while (1)
+ while (1)
(void)sleep (1);
NEEDLESS_RETURN(NULL);
}
@@ -1356,7 +1359,9 @@
left = smp_spaceleft(sg);
if (oc == NULL && needed > left && (overhead + 4096) < left) {
- /* XXX: Also check the bit we cut off isn't silly short */
+ /* XXX: Also check the bit we cut off isn't silly
+ * short
+ */
/*
* Non-objects can be trimmed down to fit what we
* have to offer (think: DVD image), but we do not
@@ -1440,7 +1445,7 @@
size += 1;
sg = sc->cur_seg;
- if (ss->ptr + ss->space != sg->next_addr + sc->ptr)
+ if (ss->ptr + ss->space != sg->next_addr + sc->ptr)
return;
Lck_Lock(&sc->mtx);
Modified: trunk/varnish-cache/bin/varnishd/varnishd.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/varnishd.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishd/varnishd.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -442,7 +442,7 @@
return;
fi = popen(p, "r");
free(p);
- if (fi == NULL)
+ if (fi == NULL)
return;
while (fgets(buf, sizeof buf, fi)) {
if (buf[0] == ' ')
@@ -663,7 +663,6 @@
exit(1);
}
-
if (i_arg != NULL) {
if (snprintf(heritage.identity, sizeof heritage.identity,
"%s", i_arg) > sizeof heritage.identity) {
@@ -672,7 +671,6 @@
exit(1);
}
}
-
if (n_arg != NULL)
openlog(n_arg, LOG_PID, LOG_LOCAL0);
Modified: trunk/varnish-cache/bin/varnishstat/varnishstat.c
===================================================================
--- trunk/varnish-cache/bin/varnishstat/varnishstat.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishstat/varnishstat.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -397,8 +397,8 @@
usage();
exit(1);
}
-
- if (xml)
+
+ if (xml)
do_xml(VSL_stats, fields);
else if (once)
do_once(VSL_stats, fields);
Modified: trunk/varnish-cache/bin/varnishtest/vtc.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishtest/vtc.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -309,7 +309,7 @@
break;
}
l = 0;
- for (i = 0; i < 1000; i++)
+ for (i = 0; i < 1000; i++)
l += random();
if (l != RND_NEXT_1K) {
vtc_log(vl, 4, "sum(random[%d...%d]) = 0x%x (expect 0x%x)",
Modified: trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_varnish.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishtest/vtc_varnish.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -67,7 +67,7 @@
struct varnish_stats *stats;
- struct vsb *args;
+ struct vsb *args;
int fds[4];
pid_t pid;
const char *telnet;
Modified: trunk/varnish-cache/bin/varnishtop/varnishtop.c
===================================================================
--- trunk/varnish-cache/bin/varnishtop/varnishtop.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/bin/varnishtop/varnishtop.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -274,7 +274,9 @@
if (tp->count <= 1.0)
break;
len = SHMLOG_LEN(tp->rec);
- printf("%9.2f %s %*.*s\n", tp->count, VSL_tags[tp->rec[SHMLOG_TAG]], len, len, tp->rec + SHMLOG_DATA);
+ printf("%9.2f %s %*.*s\n",
+ tp->count, VSL_tags[tp->rec[SHMLOG_TAG]],
+ len, len, tp->rec + SHMLOG_DATA);
}
}
Modified: trunk/varnish-cache/include/cli.h
===================================================================
--- trunk/varnish-cache/include/cli.h 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/include/cli.h 2009-11-19 19:03:25 UTC (rev 4358)
@@ -79,7 +79,7 @@
"purge <field> <operator> <arg> [&& <field> <oper> <arg>]...", \
"\tAll objects where the all the conditions match will be " \
"marked obsolete.", \
- 3, UINT_MAX
+ 3, UINT_MAX
#define CLI_PURGE_LIST \
"purge.list", \
@@ -225,13 +225,13 @@
"\tCheck status of Varnish cache process.", \
0, 0
-#define CLI_BANNER \
+#define CLI_BANNER \
"banner", \
"banner", \
"\tPrint welcome banner.", \
0, 0
-#define CLI_AUTH \
+#define CLI_AUTH \
"auth", \
"auth response", \
"\tAuthenticate.", \
Modified: trunk/varnish-cache/include/compat/daemon.h
===================================================================
--- trunk/varnish-cache/include/compat/daemon.h 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/include/compat/daemon.h 2009-11-19 19:03:25 UTC (rev 4358)
@@ -34,7 +34,7 @@
#ifndef HAVE_DAEMON
int varnish_daemon(int nochdir, int noclose);
-#else
+#else
#define varnish_daemon(a,b) daemon(a,b)
#endif
Modified: trunk/varnish-cache/include/http_headers.h
===================================================================
--- trunk/varnish-cache/include/http_headers.h 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/include/http_headers.h 2009-11-19 19:03:25 UTC (rev 4358)
@@ -57,36 +57,36 @@
HTTPH("Accept-Encoding", H_Accept_Encoding, 1, 0, 0, 0, 0) /* RFC2616 14.3 */
HTTPH("Accept-Language", H_Accept_Language, 1, 0, 0, 0, 0) /* RFC2616 14.4 */
HTTPH("Accept-Ranges", H_Accept_Ranges, 2, 3, HTTPH_R_PASS | HTTPH_A_PASS | HTTPH_R_FETCH | HTTPH_A_INS, 0, 0) /* RFC2616 14.5 */
-HTTPH("Age", H_Age, 2, 0, HTTPH_A_INS, 0, 0) /* RFC2616 14.6 */
+HTTPH("Age", H_Age, 2, 0, HTTPH_A_INS, 0, 0) /* RFC2616 14.6 */
HTTPH("Allow", H_Allow, 2, 0, 0, 0, 0) /* RFC2616 14.7 */
HTTPH("Authorization", H_Authorization, 1, 0, 0, 0, 0) /* RFC2616 14.8 */
-HTTPH("Cache-Control", H_Cache_Control, 3, 3, HTTPH_R_PASS | HTTPH_R_FETCH, 0, 0) /* RFC2616 14.9 */
+HTTPH("Cache-Control", H_Cache_Control, 3, 3, HTTPH_R_PASS | HTTPH_R_FETCH, 0, 0) /* RFC2616 14.9 */
HTTPH("Connection", H_Connection, 3, 3, HTTPH_R_PASS | HTTPH_A_PASS | HTTPH_R_FETCH | HTTPH_A_INS, 0, 0) /* RFC2616 14.10 */
HTTPH("Content-Encoding", H_Content_Encoding, 2, 0, 0, 0, 0) /* RFC2616 14.11 */
HTTPH("Content-Langugae", H_Content_Language, 2, 0, 0, 0, 0) /* RFC2616 14.12 */
-HTTPH("Content-Length", H_Content_Length, 2, 2, HTTPH_R_FETCH | HTTPH_A_INS, 0, 0) /* RFC2616 14.13 */
+HTTPH("Content-Length", H_Content_Length, 2, 2, HTTPH_R_FETCH | HTTPH_A_INS, 0, 0) /* RFC2616 14.13 */
HTTPH("Content-Location", H_Content_Location, 2, 0, 0, 0, 0) /* RFC2616 14.14 */
HTTPH("Content-MD5", H_Content_MD5, 2, 0, 0, 0, 0) /* RFC2616 14.15 */
HTTPH("Content-Range", H_Content_Range, 2, 3, HTTPH_R_PASS | HTTPH_A_PASS | HTTPH_R_FETCH | HTTPH_A_INS, 0, 0) /* RFC2616 14.16 */
HTTPH("Content-Type", H_Content_Type, 2, 0, 0, 0, 0) /* RFC2616 14.17 */
-HTTPH("Date", H_Date, 2, 0, HTTPH_A_DELIVER, 0, 0) /* RFC2616 14.18 */
+HTTPH("Date", H_Date, 2, 0, HTTPH_A_DELIVER, 0, 0) /* RFC2616 14.18 */
HTTPH("ETag", H_ETag, 2, 0, 0, 0, 0) /* RFC2616 14.19 */
HTTPH("Expect", H_Expect, 1, 0, 0, 0, 0) /* RFC2616 14.20 */
HTTPH("Expires", H_Expires, 2, 0, 0, 0, 0) /* RFC2616 14.21 */
HTTPH("From", H_From, 1, 0, 0, 0, 0) /* RFC2616 14.22 */
HTTPH("Host", H_Host, 1, 0, 0, 0, 0) /* RFC2616 14.23 */
-HTTPH("If-Match", H_If_Match, 1, 1, HTTPH_R_FETCH, 0, 0) /* RFC2616 14.24 */
-HTTPH("If-Modified-Since", H_If_Modified_Since, 1, 1, HTTPH_R_FETCH, 0, 0) /* RFC2616 14.25 */
-HTTPH("If-None-Match", H_If_None_Match, 1, 1, HTTPH_R_FETCH, 0, 0) /* RFC2616 14.26 */
-HTTPH("If-Range", H_If_Range, 1, 1, HTTPH_R_FETCH, 0, 0) /* RFC2616 14.27 */
-HTTPH("If-Unmodified-Since", H_If_Unmodifed_Since, 1, 1, HTTPH_R_FETCH, 0, 0) /* RFC2616 14.28 */
+HTTPH("If-Match", H_If_Match, 1, 1, HTTPH_R_FETCH, 0, 0) /* RFC2616 14.24 */
+HTTPH("If-Modified-Since", H_If_Modified_Since, 1, 1, HTTPH_R_FETCH, 0, 0) /* RFC2616 14.25 */
+HTTPH("If-None-Match", H_If_None_Match, 1, 1, HTTPH_R_FETCH, 0, 0) /* RFC2616 14.26 */
+HTTPH("If-Range", H_If_Range, 1, 1, HTTPH_R_FETCH, 0, 0) /* RFC2616 14.27 */
+HTTPH("If-Unmodified-Since", H_If_Unmodifed_Since, 1, 1, HTTPH_R_FETCH, 0, 0) /* RFC2616 14.28 */
HTTPH("Last-Modified", H_Last_Modified, 2, 0, 0, 0, 0) /* RFC2616 14.29 */
HTTPH("Location", H_Location, 2, 0, 0, 0, 0) /* RFC2616 14.30 */
HTTPH("Max-Forwards", H_Max_Forwards, 1, 0, 0, 0, 0) /* RFC2616 14.31 */
HTTPH("Pragma", H_Pragma, 1, 0, 0, 0, 0) /* RFC2616 14.32 */
-HTTPH("Proxy-Authenticate", H_Proxy_Authenticate, 2, 3, HTTPH_R_FETCH | HTTPH_A_INS, 0, 0) /* RFC2616 14.33 */
-HTTPH("Proxy-Authorization", H_Proxy_Authorization, 1, 3, HTTPH_R_FETCH | HTTPH_A_INS, 0, 0) /* RFC2616 14.34 */
-HTTPH("Range", H_Range, 1, 0, HTTPH_R_FETCH | HTTPH_A_INS, 0, 0) /* RFC2616 14.35 */
+HTTPH("Proxy-Authenticate", H_Proxy_Authenticate, 2, 3, HTTPH_R_FETCH | HTTPH_A_INS, 0, 0) /* RFC2616 14.33 */
+HTTPH("Proxy-Authorization", H_Proxy_Authorization, 1, 3, HTTPH_R_FETCH | HTTPH_A_INS, 0, 0) /* RFC2616 14.34 */
+HTTPH("Range", H_Range, 1, 0, HTTPH_R_FETCH | HTTPH_A_INS, 0, 0) /* RFC2616 14.35 */
HTTPH("Referer", H_Referer, 1, 0, 0, 0, 0) /* RFC2616 14.36 */
HTTPH("Retry-After", H_Retry_After, 2, 0, 0, 0, 0) /* RFC2616 14.37 */
HTTPH("Server", H_Server, 2, 0, 0, 0, 0) /* RFC2616 14.38 */
Modified: trunk/varnish-cache/include/libvarnish.h
===================================================================
--- trunk/varnish-cache/include/libvarnish.h 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/include/libvarnish.h 2009-11-19 19:03:25 UTC (rev 4358)
@@ -52,7 +52,8 @@
/* from libvarnish/subproc.c */
typedef void sub_func_f(void*);
-int SUB_run(struct vsb *sb, sub_func_f *func, void *priv, const char *name, int maxlines);
+int SUB_run(struct vsb *sb, sub_func_f *func, void *priv, const char *name,
+ int maxlines);
/* from libvarnish/tcp.c */
/* NI_MAXHOST and NI_MAXSERV are ridiculously long for numeric format */
Modified: trunk/varnish-cache/include/persistent.h
===================================================================
--- trunk/varnish-cache/include/persistent.h 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/include/persistent.h 2009-11-19 19:03:25 UTC (rev 4358)
@@ -32,7 +32,7 @@
*
* Overall layout:
*
- * struct smp_ident; Identification and geometry
+ * struct smp_ident; Identification and geometry
* sha256[...] checksum of same
*
* struct smp_sign;
@@ -134,8 +134,8 @@
struct smp_object {
unsigned char hash[32];
- double ttl;
- double ban;
+ double ttl;
+ double ban;
struct object *ptr;
uint64_t len; /* XXX: madvise */
};
Modified: trunk/varnish-cache/include/purge_vars.h
===================================================================
--- trunk/varnish-cache/include/purge_vars.h 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/include/purge_vars.h 2009-11-19 19:03:25 UTC (rev 4358)
@@ -35,6 +35,6 @@
#define PVAR_REQ 2
PVAR("req.url", PVAR_REQ, ban_cond_url)
-PVAR("obj.hash", 0, ban_cond_hash)
+PVAR("obj.hash", 0, ban_cond_hash)
PVAR("req.http.", PVAR_REQ|PVAR_HTTP, ban_cond_req_http)
PVAR("obj.http.", PVAR_HTTP, ban_cond_obj_http)
Modified: trunk/varnish-cache/include/stat_field.h
===================================================================
--- trunk/varnish-cache/include/stat_field.h 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/include/stat_field.h 2009-11-19 19:03:25 UTC (rev 4358)
@@ -72,7 +72,8 @@
MAC_STAT(n_vbe_conn, uint64_t, 0, 'i', "N struct vbe_conn")
MAC_STAT(n_wrk, uint64_t, 0, 'i', "N worker threads")
MAC_STAT(n_wrk_create, uint64_t, 0, 'a', "N worker threads created")
-MAC_STAT(n_wrk_failed, uint64_t, 0, 'a', "N worker threads not created")
+MAC_STAT(n_wrk_failed, uint64_t, 0, 'a',
+ "N worker threads not created")
MAC_STAT(n_wrk_max, uint64_t, 0, 'a', "N worker threads limited")
MAC_STAT(n_wrk_queue, uint64_t, 0, 'a', "N queued work requests")
MAC_STAT(n_wrk_overflow, uint64_t, 0, 'a', "N overflowed work requests")
@@ -89,7 +90,8 @@
MAC_STAT(n_objsendfile, uint64_t, 0, 'a', "Objects sent with sendfile")
MAC_STAT(n_objwrite, uint64_t, 0, 'a', "Objects sent with write")
-MAC_STAT(n_objoverflow, uint64_t, 1, 'a', "Objects overflowing workspace")
+MAC_STAT(n_objoverflow, uint64_t, 1, 'a',
+ "Objects overflowing workspace")
MAC_STAT(s_sess, uint64_t, 1, 'a', "Total Sessions")
MAC_STAT(s_req, uint64_t, 1, 'a', "Total Requests")
Modified: trunk/varnish-cache/include/vqueue.h
===================================================================
--- trunk/varnish-cache/include/vqueue.h 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/include/vqueue.h 2009-11-19 19:03:25 UTC (rev 4358)
@@ -242,7 +242,7 @@
(VSTAILQ_EMPTY((head)) ? \
NULL : \
((struct type *)(void *) \
- ((char *)((head)->vstqh_last) - \
+ ((char *)((head)->vstqh_last) - \
__offsetof(struct type, field))))
#define VSTAILQ_NEXT(elm, field) ((elm)->field.vstqe_next)
Modified: trunk/varnish-cache/lib/libjemalloc/jemalloc_linux.c
===================================================================
--- trunk/varnish-cache/lib/libjemalloc/jemalloc_linux.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/lib/libjemalloc/jemalloc_linux.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -1212,7 +1212,7 @@
/******************************************************************************/
/*
- * Functions missing prototypes which caused -Werror to fail.
+ * Functions missing prototypes which caused -Werror to fail.
* Not sure if it has any side effects.
* */
size_t malloc_usable_size(const void *ptr);
Modified: trunk/varnish-cache/lib/libvarnish/binary_heap.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/binary_heap.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/lib/libvarnish/binary_heap.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -186,7 +186,7 @@
v2 = CHILD(u, 1);
if (v2 < bh->next && bh->cmp(bh->priv, A(bh, v2), A(bh, v1)))
v1 = v2;
- if (bh->cmp(bh->priv, A(bh, u), A(bh, v1)))
+ if (bh->cmp(bh->priv, A(bh, u), A(bh, v1)))
return;
binhead_swap(bh, u, v1);
u = v1;
@@ -426,7 +426,7 @@
binheap_delete(bh, ff[v].idx);
} else {
ff[v].key = random();
- if (0)
+ if (0)
printf("Insert [%u] %'u\n", v, ff[v].key);
else
printf("+%u", v);
Modified: trunk/varnish-cache/lib/libvarnish/subproc.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/subproc.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/lib/libvarnish/subproc.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -66,7 +66,8 @@
}
int
-SUB_run(struct vsb *sb, sub_func_f *func, void *priv, const char *name, int maxlines)
+SUB_run(struct vsb *sb, sub_func_f *func, void *priv, const char *name,
+ int maxlines)
{
int rv, p[2], sfd, status;
pid_t pid;
Modified: trunk/varnish-cache/lib/libvarnish/tcp.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/tcp.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/lib/libvarnish/tcp.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -235,7 +235,7 @@
/*--------------------------------------------------------------------
* Set or reset SO_LINGER flag
*/
-
+
void
TCP_linger(int sock, int linger)
{
Modified: trunk/varnish-cache/lib/libvarnish/vlu.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/vlu.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/lib/libvarnish/vlu.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -47,7 +47,7 @@
unsigned bufl;
unsigned bufp;
void *priv;
- int telnet;
+ int telnet;
vlu_f *func;
};
@@ -145,7 +145,7 @@
for (p = l->buf; *p != '\0'; p = q) {
/* Find first CR or NL */
for (q = p; *q != '\0'; q++) {
- while (l->telnet >= 0 && *q == (char)255)
+ while (l->telnet >= 0 && *q == (char)255)
if (vlu_dotelnet(l, q))
return (0);
if (*q == '\n' || *q == '\r')
Modified: trunk/varnish-cache/lib/libvarnish/vsha256.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/vsha256.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/lib/libvarnish/vsha256.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -114,7 +114,7 @@
dst[i] = mybe32dec(src + i * 4);
}
-#endif
+#endif
/* Elementary functions used by SHA256 */
#define Ch(x, y, z) ((x & (y ^ z)) ^ z)
Modified: trunk/varnish-cache/lib/libvarnishcompat/execinfo.c
===================================================================
--- trunk/varnish-cache/lib/libvarnishcompat/execinfo.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/lib/libvarnishcompat/execinfo.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -116,7 +116,7 @@
rval[i] = (char *) clen;
clen += alen;
continue;
- }
+ }
}
#endif
alen = 2 + /* "0x" */
Modified: trunk/varnish-cache/lib/libvcl/vcc_acl.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_acl.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/lib/libvcl/vcc_acl.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -67,7 +67,7 @@
else if ((b) < (a)) \
return (1); \
} while (0)
-
+
static int
vcl_acl_cmp(struct acl_e *ae1, struct acl_e *ae2)
{
Modified: trunk/varnish-cache/lib/libvcl/vcc_action.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_action.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/lib/libvcl/vcc_action.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -352,7 +352,7 @@
} purge_var[] = {
#define PVAR(a, b, c) { (a), (b) },
#include "purge_vars.h"
-#undef PVAR
+#undef PVAR
{ 0, 0 }
};
Modified: trunk/varnish-cache/lib/libvcl/vcc_backend.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_backend.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/lib/libvcl/vcc_backend.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -466,7 +466,7 @@
Fb(tl, 0, "\t\t.window = %u,\n", window);
Fb(tl, 0, "\t\t.threshold = %u,\n", threshold);
}
- if (t_initial != NULL)
+ if (t_initial != NULL)
Fb(tl, 0, "\t\t.initial = %u,\n", initial);
else
Fb(tl, 0, "\t\t.initial = ~0U,\n", initial);
@@ -597,7 +597,8 @@
* not allowed here.
*/
if (u == UINT_MAX) {
- vsb_printf(tl->sb, "Value outside allowed range: ");
+ vsb_printf(tl->sb,
+ "Value outside allowed range: ");
vcc_ErrToken(tl, tl->t);
vsb_printf(tl->sb, " at\n");
vcc_ErrWhere(tl, tl->t);
Modified: trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -228,10 +228,10 @@
vsb_cat(sb, " * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWI");
vsb_cat(sb, "SE) ARISING IN ANY WAY\n * OUT OF THE USE OF THIS SOFT");
vsb_cat(sb, "WARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n");
- vsb_cat(sb, " * SUCH DAMAGE.\n *\n * $Id: vrt.h 4336 2009-10-21 11:");
- vsb_cat(sb, "36:28Z kristian $\n *\n * Runtime support for compiled");
- vsb_cat(sb, " VCL programs.\n *\n * XXX: When this file is changed,");
- vsb_cat(sb, " lib/libvcl/vcc_gen_fixed_token.tcl\n");
+ vsb_cat(sb, " * SUCH DAMAGE.\n *\n * $Id: vrt.h 4356 2009-11-19 11:");
+ vsb_cat(sb, "40:23Z phk $\n *\n * Runtime support for compiled VCL ");
+ vsb_cat(sb, "programs.\n *\n * XXX: When this file is changed, lib/");
+ vsb_cat(sb, "libvcl/vcc_gen_fixed_token.tcl\n");
vsb_cat(sb, " * XXX: *MUST* be rerun.\n */\n");
vsb_cat(sb, "\nstruct sess;\nstruct vsb;\nstruct cli;\n");
vsb_cat(sb, "struct director;\nstruct VCL_conf;\n");
Modified: trunk/varnish-cache/lib/libvcl/vcc_gen_fixed_token.tcl
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_gen_fixed_token.tcl 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/lib/libvcl/vcc_gen_fixed_token.tcl 2009-11-19 19:03:25 UTC (rev 4358)
@@ -258,12 +258,12 @@
#######################################################################
# The (possibly) cached object
{ obj.proto STRING
- RW
+ RW
{ hit error }
"const struct sess *"
}
{ obj.status INT
- RW
+ RW
{ error }
"const struct sess *"
}
@@ -491,12 +491,12 @@
puts $fo "\t\{ \"$n\", $t, [string length $n],"
}
if {$a == "RO" || $a == "RW"} {
- puts -nonewline $fo "\t \"VRT_r_${m}($pa)\","
+ puts $fo "\t \"VRT_r_${m}($pa)\","
if {![regexp HDR_ $t]} {
puts $fp "$tt($t) VRT_r_${m}($ty);"
}
} else {
- puts -nonewline $fo "\t NULL,"
+ puts $fo "\t NULL,"
}
if {$a == "WO" || $a == "RW"} {
puts $fo "\t \"VRT_l_${m}($pa, \","
@@ -554,7 +554,8 @@
} else {
set sp ""
}
- puts $fo "#define VCL_MET_[string toupper [lindex $m 0]]\t${sp}(1U << $u)"
+ puts -nonewline $fo "#define VCL_MET_[string toupper [lindex $m 0]]\t"
+ puts $fo "${sp}(1U << $u)"
incr u
}
@@ -721,7 +722,7 @@
puts -nonewline $fo "'[string index $k 1]'"
puts $fo ", [lindex $ty 1]);"
continue;
- }
+ }
puts -nonewline $fo " if ("
for {set i 1} {$i < [string length $k]} {incr i} {
if {$i > 1} {
Modified: trunk/varnish-cache/lib/libvcl/vcc_obj.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_obj.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/lib/libvcl/vcc_obj.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -12,260 +12,306 @@
struct var vcc_vars[] = {
{ "client.ip", IP, 9,
- "VRT_r_client_ip(sp)", NULL,
+ "VRT_r_client_ip(sp)",
+ NULL,
V_RO, 0,
VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
| VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
| VCL_MET_ERROR
},
{ "server.ip", IP, 9,
- "VRT_r_server_ip(sp)", NULL,
+ "VRT_r_server_ip(sp)",
+ NULL,
V_RO, 0,
VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
| VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
| VCL_MET_ERROR
},
{ "server.hostname", STRING, 15,
- "VRT_r_server_hostname(sp)", NULL,
+ "VRT_r_server_hostname(sp)",
+ NULL,
V_RO, 0,
VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
| VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
| VCL_MET_ERROR
},
{ "server.identity", STRING, 15,
- "VRT_r_server_identity(sp)", NULL,
+ "VRT_r_server_identity(sp)",
+ NULL,
V_RO, 0,
VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
| VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
| VCL_MET_ERROR
},
{ "server.port", INT, 11,
- "VRT_r_server_port(sp)", NULL,
+ "VRT_r_server_port(sp)",
+ NULL,
V_RO, 0,
VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
| VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
| VCL_MET_ERROR
},
{ "req.request", STRING, 11,
- "VRT_r_req_request(sp)", "VRT_l_req_request(sp, ",
+ "VRT_r_req_request(sp)",
+ "VRT_l_req_request(sp, ",
V_RW, 0,
VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
| VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
| VCL_MET_ERROR
},
{ "req.url", STRING, 7,
- "VRT_r_req_url(sp)", "VRT_l_req_url(sp, ",
+ "VRT_r_req_url(sp)",
+ "VRT_l_req_url(sp, ",
V_RW, 0,
VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
| VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
| VCL_MET_ERROR
},
{ "req.proto", STRING, 9,
- "VRT_r_req_proto(sp)", "VRT_l_req_proto(sp, ",
+ "VRT_r_req_proto(sp)",
+ "VRT_l_req_proto(sp, ",
V_RW, 0,
VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
| VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
| VCL_MET_ERROR
},
{ "req.http.", HEADER, 9,
- "VRT_r_req_http_(sp)", "VRT_l_req_http_(sp, ",
+ "VRT_r_req_http_(sp)",
+ "VRT_l_req_http_(sp, ",
V_RW, "HDR_REQ",
VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
| VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
| VCL_MET_ERROR
},
{ "req.hash", HASH, 8,
- NULL, "VRT_l_req_hash(sp, ",
+ NULL,
+ "VRT_l_req_hash(sp, ",
V_WO, 0,
VCL_MET_HASH | VCL_MET_ERROR
},
{ "req.backend", BACKEND, 11,
- "VRT_r_req_backend(sp)", "VRT_l_req_backend(sp, ",
+ "VRT_r_req_backend(sp)",
+ "VRT_l_req_backend(sp, ",
V_RW, 0,
VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
| VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
| VCL_MET_ERROR
},
{ "req.restarts", INT, 12,
- "VRT_r_req_restarts(sp)", NULL,
+ "VRT_r_req_restarts(sp)",
+ NULL,
V_RO, 0,
VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
| VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
| VCL_MET_ERROR
},
{ "req.grace", TIME, 9,
- "VRT_r_req_grace(sp)", "VRT_l_req_grace(sp, ",
+ "VRT_r_req_grace(sp)",
+ "VRT_l_req_grace(sp, ",
V_RW, 0,
VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
| VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
| VCL_MET_ERROR
},
{ "req.xid", STRING, 7,
- "VRT_r_req_xid(sp)", NULL,
+ "VRT_r_req_xid(sp)",
+ NULL,
V_RO, 0,
VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
| VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
| VCL_MET_ERROR
},
{ "req.esi", BOOL, 7,
- "VRT_r_req_esi(sp)", "VRT_l_req_esi(sp, ",
+ "VRT_r_req_esi(sp)",
+ "VRT_l_req_esi(sp, ",
V_RW, 0,
VCL_MET_RECV | VCL_MET_FETCH | VCL_MET_DELIVER | VCL_MET_ERROR
},
{ "req.backend.healthy", BOOL, 19,
- "VRT_r_req_backend_healthy(sp)", NULL,
+ "VRT_r_req_backend_healthy(sp)",
+ NULL,
V_RO, 0,
VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
| VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
| VCL_MET_ERROR
},
{ "bereq.request", STRING, 13,
- "VRT_r_bereq_request(sp)", "VRT_l_bereq_request(sp, ",
+ "VRT_r_bereq_request(sp)",
+ "VRT_l_bereq_request(sp, ",
V_RW, 0,
VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_MISS | VCL_MET_FETCH
},
{ "bereq.url", STRING, 9,
- "VRT_r_bereq_url(sp)", "VRT_l_bereq_url(sp, ",
+ "VRT_r_bereq_url(sp)",
+ "VRT_l_bereq_url(sp, ",
V_RW, 0,
VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_MISS | VCL_MET_FETCH
},
{ "bereq.proto", STRING, 11,
- "VRT_r_bereq_proto(sp)", "VRT_l_bereq_proto(sp, ",
+ "VRT_r_bereq_proto(sp)",
+ "VRT_l_bereq_proto(sp, ",
V_RW, 0,
VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_MISS | VCL_MET_FETCH
},
{ "bereq.http.", HEADER, 11,
- "VRT_r_bereq_http_(sp)", "VRT_l_bereq_http_(sp, ",
+ "VRT_r_bereq_http_(sp)",
+ "VRT_l_bereq_http_(sp, ",
V_RW, "HDR_BEREQ",
VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_MISS | VCL_MET_FETCH
},
{ "bereq.connect_timeout", TIME, 21,
- "VRT_r_bereq_connect_timeout(sp)", "VRT_l_bereq_connect_timeout(sp, ",
+ "VRT_r_bereq_connect_timeout(sp)",
+ "VRT_l_bereq_connect_timeout(sp, ",
V_RW, 0,
VCL_MET_PASS | VCL_MET_MISS
},
{ "bereq.first_byte_timeout", TIME, 24,
- "VRT_r_bereq_first_byte_timeout(sp)", "VRT_l_bereq_first_byte_timeout(sp, ",
+ "VRT_r_bereq_first_byte_timeout(sp)",
+ "VRT_l_bereq_first_byte_timeout(sp, ",
V_RW, 0,
VCL_MET_PASS | VCL_MET_MISS
},
{ "bereq.between_bytes_timeout", TIME, 27,
- "VRT_r_bereq_between_bytes_timeout(sp)", "VRT_l_bereq_between_bytes_timeout(sp, ",
+ "VRT_r_bereq_between_bytes_timeout(sp)",
+ "VRT_l_bereq_between_bytes_timeout(sp, ",
V_RW, 0,
VCL_MET_PASS | VCL_MET_MISS
},
{ "beresp.proto", STRING, 12,
- "VRT_r_beresp_proto(sp)", "VRT_l_beresp_proto(sp, ",
+ "VRT_r_beresp_proto(sp)",
+ "VRT_l_beresp_proto(sp, ",
V_RW, 0,
VCL_MET_FETCH
},
{ "beresp.saintmode", TIME, 16,
- NULL, "VRT_l_beresp_saintmode(sp, ",
+ NULL,
+ "VRT_l_beresp_saintmode(sp, ",
V_WO, 0,
VCL_MET_FETCH
},
{ "beresp.status", INT, 13,
- "VRT_r_beresp_status(sp)", "VRT_l_beresp_status(sp, ",
+ "VRT_r_beresp_status(sp)",
+ "VRT_l_beresp_status(sp, ",
V_RW, 0,
VCL_MET_FETCH
},
{ "beresp.response", STRING, 15,
- "VRT_r_beresp_response(sp)", "VRT_l_beresp_response(sp, ",
+ "VRT_r_beresp_response(sp)",
+ "VRT_l_beresp_response(sp, ",
V_RW, 0,
VCL_MET_FETCH
},
{ "beresp.http.", HEADER, 12,
- "VRT_r_beresp_http_(sp)", "VRT_l_beresp_http_(sp, ",
+ "VRT_r_beresp_http_(sp)",
+ "VRT_l_beresp_http_(sp, ",
V_RW, "HDR_BERESP",
VCL_MET_FETCH
},
{ "beresp.cacheable", BOOL, 16,
- "VRT_r_beresp_cacheable(sp)", "VRT_l_beresp_cacheable(sp, ",
+ "VRT_r_beresp_cacheable(sp)",
+ "VRT_l_beresp_cacheable(sp, ",
V_RW, 0,
VCL_MET_FETCH
},
{ "beresp.ttl", TIME, 10,
- "VRT_r_beresp_ttl(sp)", "VRT_l_beresp_ttl(sp, ",
+ "VRT_r_beresp_ttl(sp)",
+ "VRT_l_beresp_ttl(sp, ",
V_RW, 0,
VCL_MET_FETCH
},
{ "beresp.grace", TIME, 12,
- "VRT_r_beresp_grace(sp)", "VRT_l_beresp_grace(sp, ",
+ "VRT_r_beresp_grace(sp)",
+ "VRT_l_beresp_grace(sp, ",
V_RW, 0,
VCL_MET_FETCH
},
{ "obj.proto", STRING, 9,
- "VRT_r_obj_proto(sp)", "VRT_l_obj_proto(sp, ",
+ "VRT_r_obj_proto(sp)",
+ "VRT_l_obj_proto(sp, ",
V_RW, 0,
VCL_MET_HIT | VCL_MET_ERROR
},
{ "obj.status", INT, 10,
- "VRT_r_obj_status(sp)", "VRT_l_obj_status(sp, ",
+ "VRT_r_obj_status(sp)",
+ "VRT_l_obj_status(sp, ",
V_RW, 0,
VCL_MET_ERROR
},
{ "obj.response", STRING, 12,
- "VRT_r_obj_response(sp)", "VRT_l_obj_response(sp, ",
+ "VRT_r_obj_response(sp)",
+ "VRT_l_obj_response(sp, ",
V_RW, 0,
VCL_MET_ERROR
},
{ "obj.hits", INT, 8,
- "VRT_r_obj_hits(sp)", NULL,
+ "VRT_r_obj_hits(sp)",
+ NULL,
V_RO, 0,
VCL_MET_HIT | VCL_MET_DELIVER
},
{ "obj.http.", HEADER, 9,
- "VRT_r_obj_http_(sp)", "VRT_l_obj_http_(sp, ",
+ "VRT_r_obj_http_(sp)",
+ "VRT_l_obj_http_(sp, ",
V_RW, "HDR_OBJ",
VCL_MET_HIT | VCL_MET_ERROR
},
{ "obj.cacheable", BOOL, 13,
- "VRT_r_obj_cacheable(sp)", "VRT_l_obj_cacheable(sp, ",
+ "VRT_r_obj_cacheable(sp)",
+ "VRT_l_obj_cacheable(sp, ",
V_RW, 0,
VCL_MET_HIT
},
{ "obj.ttl", TIME, 7,
- "VRT_r_obj_ttl(sp)", "VRT_l_obj_ttl(sp, ",
+ "VRT_r_obj_ttl(sp)",
+ "VRT_l_obj_ttl(sp, ",
V_RW, 0,
VCL_MET_HIT | VCL_MET_ERROR
},
{ "obj.grace", TIME, 9,
- "VRT_r_obj_grace(sp)", "VRT_l_obj_grace(sp, ",
+ "VRT_r_obj_grace(sp)",
+ "VRT_l_obj_grace(sp, ",
V_RW, 0,
VCL_MET_HIT | VCL_MET_ERROR
},
{ "obj.lastuse", TIME, 11,
- "VRT_r_obj_lastuse(sp)", NULL,
+ "VRT_r_obj_lastuse(sp)",
+ NULL,
V_RO, 0,
VCL_MET_HIT | VCL_MET_DELIVER | VCL_MET_ERROR
},
{ "obj.hash", STRING, 8,
- "VRT_r_obj_hash(sp)", NULL,
+ "VRT_r_obj_hash(sp)",
+ NULL,
V_RO, 0,
VCL_MET_MISS | VCL_MET_HIT | VCL_MET_DELIVER | VCL_MET_ERROR
},
{ "resp.proto", STRING, 10,
- "VRT_r_resp_proto(sp)", "VRT_l_resp_proto(sp, ",
+ "VRT_r_resp_proto(sp)",
+ "VRT_l_resp_proto(sp, ",
V_RW, 0,
VCL_MET_DELIVER
},
{ "resp.status", INT, 11,
- "VRT_r_resp_status(sp)", "VRT_l_resp_status(sp, ",
+ "VRT_r_resp_status(sp)",
+ "VRT_l_resp_status(sp, ",
V_RW, 0,
VCL_MET_DELIVER
},
{ "resp.response", STRING, 13,
- "VRT_r_resp_response(sp)", "VRT_l_resp_response(sp, ",
+ "VRT_r_resp_response(sp)",
+ "VRT_l_resp_response(sp, ",
V_RW, 0,
VCL_MET_DELIVER
},
{ "resp.http.", HEADER, 10,
- "VRT_r_resp_http_(sp)", "VRT_l_resp_http_(sp, ",
+ "VRT_r_resp_http_(sp)",
+ "VRT_l_resp_http_(sp, ",
V_RW, "HDR_RESP",
VCL_MET_DELIVER
},
{ "now", TIME, 3,
- "VRT_r_now(sp)", NULL,
+ "VRT_r_now(sp)",
+ NULL,
V_RO, 0,
VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
| VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
Modified: trunk/varnish-cache/lib/libvcl/vcc_xref.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_xref.c 2009-11-19 12:00:12 UTC (rev 4357)
+++ trunk/varnish-cache/lib/libvcl/vcc_xref.c 2009-11-19 19:03:25 UTC (rev 4358)
@@ -269,7 +269,7 @@
u = p->ret_bitmap & ~bitmap;
if (u) {
/*lint -save -e525 -e539 */
-#define VCL_RET_MAC(l, U) \
+#define VCL_RET_MAC(l, U) \
if (u & (1 << (VCL_RET_##U))) { \
vsb_printf(tl->sb, "Invalid return \"" #l "\"\n");\
vcc_ErrWhere(tl, p->return_tok[VCL_RET_##U]); \
More information about the varnish-commit
mailing list