[experimental-ims] 718e877 Wrap lines
Geoff Simmons
geoff at varnish-cache.org
Tue Jan 10 00:03:32 CET 2012
commit 718e87721891249567bac736ea5e03c11ee63f77
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Sun Dec 25 11:05:14 2011 +0000
Wrap lines
diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 0b3c261..24aedb4 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -348,7 +348,8 @@ vbe_GetVbe(const struct sess *sp, struct vdi_simple *vs)
/* XXX locking of stats */
VSC_C_main->backend_reuse += 1;
WSP(sp, SLT_Backend, "%d %s %s",
- vc->fd, sp->req->director->vcl_name, bp->display_name);
+ vc->fd, sp->req->director->vcl_name,
+ bp->display_name);
vc->vdis = vs;
vc->recycled = 1;
return (vc);
diff --git a/bin/varnishd/cache/cache_hash.c b/bin/varnishd/cache/cache_hash.c
index 5d8c880..9f2c053 100644
--- a/bin/varnishd/cache/cache_hash.c
+++ b/bin/varnishd/cache/cache_hash.c
@@ -307,7 +307,8 @@ HSH_Lookup(struct sess *sp, struct objhead **poh)
wrk = sp->wrk;
HSH_Prealloc(sp);
- memcpy(sp->wrk->nobjhead->digest, sp->req->digest, sizeof sp->req->digest);
+ memcpy(sp->wrk->nobjhead->digest, sp->req->digest,
+ sizeof sp->req->digest);
if (cache_param->diag_bitmap & 0x80000000)
hsh_testmagic(sp->wrk->nobjhead->digest);
diff --git a/bin/varnishd/cache/cache_http.c b/bin/varnishd/cache/cache_http.c
index cb17df4..f441ef2 100644
--- a/bin/varnishd/cache/cache_http.c
+++ b/bin/varnishd/cache/cache_http.c
@@ -880,7 +880,8 @@ http_FilterHeader(const struct sess *sp, unsigned how)
else
http_copyh(hp, sp->req->http, HTTP_HDR_PROTO);
http_FilterFields(sp->wrk, sp->vsl_id, hp, sp->req->http, how);
- http_PrintfHeader(sp->wrk, sp->vsl_id, hp, "X-Varnish: %u", sp->req->xid);
+ http_PrintfHeader(sp->wrk, sp->vsl_id, hp,
+ "X-Varnish: %u", sp->req->xid);
}
/*--------------------------------------------------------------------
diff --git a/bin/varnishd/cache/cache_pipe.c b/bin/varnishd/cache/cache_pipe.c
index a8282d7..21fefef 100644
--- a/bin/varnishd/cache/cache_pipe.c
+++ b/bin/varnishd/cache/cache_pipe.c
@@ -84,7 +84,8 @@ PipeSession(struct sess *sp)
if (sp->req->htc->pipeline.b != NULL)
sp->wrk->acct_tmp.bodybytes +=
- WRW_Write(w, sp->req->htc->pipeline.b, Tlen(sp->req->htc->pipeline));
+ WRW_Write(w, sp->req->htc->pipeline.b,
+ Tlen(sp->req->htc->pipeline));
i = WRW_FlushRelease(w);
diff --git a/bin/varnishd/cache/cache_response.c b/bin/varnishd/cache/cache_response.c
index 6b2ea78..2398e5b 100644
--- a/bin/varnishd/cache/cache_response.c
+++ b/bin/varnishd/cache/cache_response.c
@@ -139,7 +139,8 @@ RES_BuildHttp(const struct sess *sp)
http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp,
"X-Varnish: %u", sp->req->xid);
http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp, "Age: %.0f",
- sp->wrk->obj->exp.age + sp->req->t_resp - sp->wrk->obj->exp.entered);
+ sp->wrk->obj->exp.age + sp->req->t_resp -
+ sp->wrk->obj->exp.entered);
http_SetHeader(sp->wrk, sp->vsl_id, sp->wrk->resp, "Via: 1.1 varnish");
http_PrintfHeader(sp->wrk, sp->vsl_id, sp->wrk->resp, "Connection: %s",
sp->req->doclose ? "close" : "keep-alive");
diff --git a/bin/varnishd/cache/cache_vary.c b/bin/varnishd/cache/cache_vary.c
index d524fd3..453b52d 100644
--- a/bin/varnishd/cache/cache_vary.c
+++ b/bin/varnishd/cache/cache_vary.c
@@ -187,7 +187,8 @@ VRY_Match(const struct sess *sp, const uint8_t *vary)
if (i == 1) {
/* Build a new entry */
- i = http_GetHdr(sp->req->http, (const char*)(vary+2), &h);
+ i = http_GetHdr(sp->req->http,
+ (const char*)(vary+2), &h);
if (i) {
/* Trim trailing space */
e = strchr(h, '\0');
diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index 4cf61c4..ad5acf0 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -334,12 +334,12 @@ VCL_##func##_method(struct sess *sp) \
{ \
\
sp->req->handling = 0; \
- sp->req->cur_method = VCL_MET_ ## upper; \
+ sp->req->cur_method = VCL_MET_ ## upper; \
WSP(sp, SLT_VCL_call, "%s", #func); \
- (void)sp->req->vcl->func##_func(sp); \
- WSP(sp, SLT_VCL_return, "%s", VCL_Return_Name(sp->req->handling)); \
- sp->req->cur_method = 0; \
- assert((1U << sp->req->handling) & bitmap); \
+ (void)sp->req->vcl->func##_func(sp); \
+ WSP(sp, SLT_VCL_return, "%s", VCL_Return_Name(sp->req->handling)); \
+ sp->req->cur_method = 0; \
+ assert((1U << sp->req->handling) & bitmap); \
assert(!((1U << sp->req->handling) & ~bitmap)); \
}
More information about the varnish-commit
mailing list