[master] dbbaea9 An OCD a day keeps the white-space away...
Poul-Henning Kamp
phk at FreeBSD.org
Tue Jul 15 11:30:25 CEST 2014
commit dbbaea9f5ae9b73524d5d336c138b54871f60450
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Tue Jul 15 09:30:04 2014 +0000
An OCD a day keeps the white-space away...
diff --git a/bin/varnishd/cache/cache_esi_deliver.c b/bin/varnishd/cache/cache_esi_deliver.c
index ee1b0e5..924a22a 100644
--- a/bin/varnishd/cache/cache_esi_deliver.c
+++ b/bin/varnishd/cache/cache_esi_deliver.c
@@ -553,7 +553,7 @@ ESI_DeliverChild(struct req *req)
case 5: /* xxxxx000 00000000 00000000 11111111 11111111 */
dbits[1] = cc | 0x00;
dbits[2] = 0x00; dbits[3] = 0x00;
- dbits[4] = 0xff; dbits[5] = 0xff;
+ dbits[4] = 0xff; dbits[5] = 0xff;
lpad = 5;
break;
case 2: /* xx010000 00000100 00000001 00000000 */
@@ -578,7 +578,7 @@ ESI_DeliverChild(struct req *req)
dbits[1] = cc | 0x00;
dbits[2] = 0x00;
dbits[3] = 0x00; dbits[4] = 0x00;
- dbits[5] = 0xff; dbits[6] = 0xff;
+ dbits[5] = 0xff; dbits[6] = 0xff;
lpad = 6;
break;
default:
diff --git a/bin/varnishd/cache/cache_gzip.c b/bin/varnishd/cache/cache_gzip.c
index 904d26d..66e0845 100644
--- a/bin/varnishd/cache/cache_gzip.c
+++ b/bin/varnishd/cache/cache_gzip.c
@@ -455,7 +455,7 @@ vfp_gzip_init(struct vfp_ctx *vc, struct vfp_entry *vfe)
{
struct vgz *vg;
- CHECK_OBJ_NOTNULL(vc, VFP_CTX_MAGIC);
+ CHECK_OBJ_NOTNULL(vc, VFP_CTX_MAGIC);
CHECK_OBJ_NOTNULL(vfe, VFP_ENTRY_MAGIC);
if (http_HdrIs(vc->http, H_Content_Length, "0")) {
@@ -502,18 +502,18 @@ static enum vfp_status __match_proto__(vfp_pull_f)
vfp_gunzip_pull(struct vfp_ctx *vc, struct vfp_entry *vfe, void *p,
ssize_t *lp)
{
- ssize_t l;
+ ssize_t l;
struct vgz *vg;
enum vgzret_e vr = VGZ_ERROR;
const void *dp;
size_t dl;
enum vfp_status vp = VFP_OK;
- CHECK_OBJ_NOTNULL(vc, VFP_CTX_MAGIC);
+ CHECK_OBJ_NOTNULL(vc, VFP_CTX_MAGIC);
CHECK_OBJ_NOTNULL(vfe, VFP_ENTRY_MAGIC);
CAST_OBJ_NOTNULL(vg, vfe->priv1, VGZ_MAGIC);
- AN(p);
- AN(lp);
+ AN(p);
+ AN(lp);
l = *lp;
*lp = 0;
VGZ_Obuf(vg, p, l);
@@ -556,19 +556,19 @@ static enum vfp_status __match_proto__(vfp_pull_f)
vfp_gzip_pull(struct vfp_ctx *vc, struct vfp_entry *vfe, void *p,
ssize_t *lp)
{
- ssize_t l;
+ ssize_t l;
struct vgz *vg;
enum vgzret_e vr = VGZ_ERROR;
const void *dp;
size_t dl;
enum vfp_status vp = VFP_ERROR;
- CHECK_OBJ_NOTNULL(vc, VFP_CTX_MAGIC);
- CHECK_OBJ_NOTNULL(vc->bo, BUSYOBJ_MAGIC);
+ CHECK_OBJ_NOTNULL(vc, VFP_CTX_MAGIC);
+ CHECK_OBJ_NOTNULL(vc->bo, BUSYOBJ_MAGIC);
CHECK_OBJ_NOTNULL(vfe, VFP_ENTRY_MAGIC);
CAST_OBJ_NOTNULL(vg, vfe->priv1, VGZ_MAGIC);
- AN(p);
- AN(lp);
+ AN(p);
+ AN(lp);
l = *lp;
*lp = 0;
VGZ_Obuf(vg, p, l);
@@ -618,12 +618,12 @@ vfp_testgunzip_pull(struct vfp_ctx *vc, struct vfp_entry *vfe, void *p,
size_t dl;
enum vfp_status vp;
- CHECK_OBJ_NOTNULL(vc, VFP_CTX_MAGIC);
- CHECK_OBJ_NOTNULL(vc->bo, BUSYOBJ_MAGIC);
+ CHECK_OBJ_NOTNULL(vc, VFP_CTX_MAGIC);
+ CHECK_OBJ_NOTNULL(vc->bo, BUSYOBJ_MAGIC);
CHECK_OBJ_NOTNULL(vfe, VFP_ENTRY_MAGIC);
CAST_OBJ_NOTNULL(vg, vfe->priv1, VGZ_MAGIC);
- AN(p);
- AN(lp);
+ AN(p);
+ AN(lp);
CAST_OBJ_NOTNULL(vg, vfe->priv1, VGZ_MAGIC);
vp = VFP_Suck(vc, p, lp);
if (vp == VFP_ERROR)
@@ -655,7 +655,7 @@ vfp_gzip_fini(struct vfp_ctx *vc, struct vfp_entry *vfe)
{
struct vgz *vg;
- CHECK_OBJ_NOTNULL(vc, VFP_CTX_MAGIC);
+ CHECK_OBJ_NOTNULL(vc, VFP_CTX_MAGIC);
CHECK_OBJ_NOTNULL(vfe, VFP_ENTRY_MAGIC);
if (vfe->priv1 != NULL) {
diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index 161c5e8..927abc4 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -907,7 +907,7 @@ CNT_Request(struct worker *wrk, struct req *req)
if (DO_DEBUG(DBG_REQ_STATE)) \
cnt_diag(req, #u); \
nxt = cnt_##l arg; \
- break;
+ break;
#include "tbl/steps.h"
#undef REQ_STEP
default:
diff --git a/bin/varnishd/mgt/mgt_param_tbl.c b/bin/varnishd/mgt/mgt_param_tbl.c
index be862e2..90c37fc 100644
--- a/bin/varnishd/mgt/mgt_param_tbl.c
+++ b/bin/varnishd/mgt/mgt_param_tbl.c
@@ -203,7 +203,7 @@ struct parspec mgt_parspec[] = {
"0", NULL,
"Send timeout for client connections. "
"If the HTTP response hasn't been transmitted in this many\n"
- "seconds the session is closed.\n"
+ "seconds the session is closed.\n"
"See setsockopt(2) under SO_SNDTIMEO for more information.",
DELAYED_EFFECT,
"600", "seconds" },
@@ -211,7 +211,7 @@ struct parspec mgt_parspec[] = {
"0", NULL,
"Time to wait with no data sent. "
"If no data has been transmitted in this many\n"
- "seconds the session is closed.\n"
+ "seconds the session is closed.\n"
"See setsockopt(2) under SO_SNDTIMEO for more information.",
DELAYED_EFFECT,
"60", "seconds" },
@@ -500,7 +500,7 @@ struct parspec mgt_parspec[] = {
"8", ""},
{ "gzip_buffer",
tweak_bytes_u, &mgt_param.gzip_buffer,
- "2048", NULL,
+ "2048", NULL,
"Size of malloc buffer used for gzip processing.\n"
"These buffers are used for in-transit data,"
" for instance gunzip'ed data being sent to a client."
diff --git a/bin/varnishd/mgt/mgt_sandbox_solaris.c b/bin/varnishd/mgt/mgt_sandbox_solaris.c
index 255b99c..9ead087 100644
--- a/bin/varnishd/mgt/mgt_sandbox_solaris.c
+++ b/bin/varnishd/mgt/mgt_sandbox_solaris.c
@@ -202,7 +202,7 @@ setppriv_check(int a) {
*
* > 0t_PID_::pid2proc | ::print proc_t p_flag | >a
* > (<a & 0x10000000)=X
- * 0
+ * 0
*
* (a value of 0x10000000 indicates that SNOCD is set)
*
@@ -346,15 +346,15 @@ mgt_sandbox_solaris_privsep(enum sandbox_e who)
(void)who;
if (priv_ineffect(PRIV_PROC_SETID)) {
- if (getgid() != mgt_param.gid)
- XXXAZ(setgid(mgt_param.gid));
- if (getuid() != mgt_param.uid)
- XXXAZ(setuid(mgt_param.uid));
- } else {
- REPORT(LOG_INFO,
+ if (getgid() != mgt_param.gid)
+ XXXAZ(setgid(mgt_param.gid));
+ if (getuid() != mgt_param.uid)
+ XXXAZ(setuid(mgt_param.uid));
+ } else {
+ REPORT(LOG_INFO,
"Privilege %s missing, will not change uid/gid",
PRIV_PROC_SETID);
- }
+ }
}
/*
diff --git a/bin/varnishd/storage/storage_persistent.c b/bin/varnishd/storage/storage_persistent.c
index a22e126..acc8f84 100644
--- a/bin/varnishd/storage/storage_persistent.c
+++ b/bin/varnishd/storage/storage_persistent.c
@@ -676,8 +676,8 @@ debug_persistent(struct cli *cli, const char * const * av, void *priv)
}
static struct cli_proto debug_cmds[] = {
- { "debug.persistent", "debug.persistent",
- "Persistent debugging magic:\n"
+ { "debug.persistent", "debug.persistent",
+ "Persistent debugging magic:\n"
"\tdebug.persistent [stevedore [cmd]]\n"
"With no cmd arg, a summary of the silo is returned.\n"
"Possible commands:\n"
@@ -685,7 +685,7 @@ static struct cli_proto debug_cmds[] = {
"\tdump\tinclude objcores in silo summary\n"
"",
0, 2, "d", debug_persistent },
- { NULL }
+ { NULL }
};
/*--------------------------------------------------------------------*/
More information about the varnish-commit
mailing list