[experimental-ims] af353a6 Administrative fixes: - Cleanup whitespace bogons - Make all machine-generated no-copyright notices consistent - Update copyrights
Geoff Simmons
geoff at varnish-cache.org
Wed Aug 31 16:04:45 CEST 2011
commit af353a6b6a45e2a47e17aa84389950a1c65854ec
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Mon Aug 29 07:41:17 2011 +0000
Administrative fixes:
- Cleanup whitespace bogons
- Make all machine-generated no-copyright notices consistent
- Update copyrights
diff --git a/bin/varnishd/cache.h b/bin/varnishd/cache.h
index 974ea3f..0509d99 100644
--- a/bin/varnishd/cache.h
+++ b/bin/varnishd/cache.h
@@ -177,7 +177,7 @@ struct http {
uint16_t nhd; /* Next free hd */
uint16_t status;
uint8_t protover;
- uint8_t conds; /* If-* headers present */
+ uint8_t conds; /* If-* headers present */
};
/*--------------------------------------------------------------------
@@ -494,7 +494,7 @@ struct object {
struct ws ws_o[1];
- uint8_t *vary;
+ uint8_t *vary;
unsigned hits;
uint16_t response;
diff --git a/bin/varnishd/cache_backend_poll.c b/bin/varnishd/cache_backend_poll.c
index e504f0c..0854dfd 100644
--- a/bin/varnishd/cache_backend_poll.c
+++ b/bin/varnishd/cache_backend_poll.c
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2010 Varnish Software AS
+ * Copyright (c) 2006-2011 Varnish Software AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
@@ -491,7 +491,7 @@ VBP_Insert(struct backend *b, const struct vrt_backend_probe *p, const char *hos
vt = b->probe;
}
- VTAILQ_FOREACH(vcl, &vt->vcls, list)
+ VTAILQ_FOREACH(vcl, &vt->vcls, list)
assert (vcl->probep != p);
vcl = vbp_new_vcl(p, hosthdr);
diff --git a/bin/varnishd/cache_ban.c b/bin/varnishd/cache_ban.c
index bbfe57f..4c95592 100644
--- a/bin/varnishd/cache_ban.c
+++ b/bin/varnishd/cache_ban.c
@@ -262,7 +262,7 @@ ban_iter(const uint8_t **bs, struct ban_test *bt)
}
bt->arg2 = ban_get_lump(bs);
bt->oper = *(*bs)++;
- if (bt->oper == BAN_OPER_MATCH || bt->oper == BAN_OPER_NMATCH)
+ if (bt->oper == BAN_OPER_MATCH || bt->oper == BAN_OPER_NMATCH)
bt->arg2_spec = ban_get_lump(bs);
}
diff --git a/bin/varnishd/cache_center.c b/bin/varnishd/cache_center.c
index 21731db..df9941c 100644
--- a/bin/varnishd/cache_center.c
+++ b/bin/varnishd/cache_center.c
@@ -438,7 +438,7 @@ cnt_error(struct sess *sp)
EXP_Clr(&w->exp);
sp->obj = STV_NewObject(sp, NULL, 1024, &w->exp,
(uint16_t)params->http_max_hdr);
- if (sp->obj == NULL)
+ if (sp->obj == NULL)
sp->obj = STV_NewObject(sp, TRANSIENT_STORAGE,
1024, &w->exp, (uint16_t)params->http_max_hdr);
if (sp->obj == NULL) {
diff --git a/bin/varnishd/cache_dir_round_robin.c b/bin/varnishd/cache_dir_round_robin.c
index 61d80fc..8e47198 100644
--- a/bin/varnishd/cache_dir_round_robin.c
+++ b/bin/varnishd/cache_dir_round_robin.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2010 Varnish Software AS
+ * Copyright (c) 2008-2011 Varnish Software AS
* All rights reserved.
*
* Author: Petter Knudsen <petter at linpro.no>
@@ -71,8 +71,8 @@ vdi_round_robin_getfd(const struct director *d, struct sess *sp)
CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
CAST_OBJ_NOTNULL(vs, d->priv, VDI_ROUND_ROBIN_MAGIC);
- /*
- * In fallback mode we ignore the next_host and always grab the
+ /*
+ * In fallback mode we ignore the next_host and always grab the
* first healthy backend we can find.
*/
for (i = 0; i < vs->nhosts; i++) {
diff --git a/bin/varnishd/cache_expire.c b/bin/varnishd/cache_expire.c
index 97e5734..b32d22b 100644
--- a/bin/varnishd/cache_expire.c
+++ b/bin/varnishd/cache_expire.c
@@ -46,7 +46,7 @@
* ttl | v
* +---------------------------->+
* keep
- *
+ *
*/
#include "config.h"
diff --git a/bin/varnishd/cache_vary.c b/bin/varnishd/cache_vary.c
index 89e1675..73d6354 100644
--- a/bin/varnishd/cache_vary.c
+++ b/bin/varnishd/cache_vary.c
@@ -226,7 +226,7 @@ VRY_Match(struct sess *sp, const uint8_t *vary)
i = vry_cmp(&vary, &vsp);
assert(i != 1); /* hdr must be the same now */
}
- if (i != 0)
+ if (i != 0)
retval = 0;
vsp += vry_len(vsp);
vary += vry_len(vary);
@@ -241,7 +241,7 @@ VRY_Match(struct sess *sp, const uint8_t *vary)
vsp[0] = 0xff;
vsp[1] = 0xff;
vsp[2] = 0;
- if (oflo)
+ if (oflo)
sp->vary_l = NULL;
else
sp->vary_l = vsp + 3;
diff --git a/bin/varnishd/mgt_shmem.c b/bin/varnishd/mgt_shmem.c
index 4fc905c..17789f8 100644
--- a/bin/varnishd/mgt_shmem.c
+++ b/bin/varnishd/mgt_shmem.c
@@ -153,7 +153,7 @@ vsl_n_check(int fd)
if (slh.hdrsize != sizeof slh)
return;
if (slh.master_pid != 0 && !kill(slh.master_pid, 0)) {
- fprintf(stderr,
+ fprintf(stderr,
"WARNING: Taking over SHMFILE marked as owned by "
"running process (pid=%jd)\n",
(intmax_t)slh.master_pid);
@@ -184,7 +184,7 @@ vsl_buildnew(const char *fn, unsigned size, int fill)
assert(flags != -1);
flags &= ~O_NONBLOCK;
AZ(fcntl(vsl_fd, F_SETFL, flags));
-
+
memset(&slh, 0, sizeof slh);
slh.magic = VSM_HEAD_MAGIC;
slh.hdrsize = sizeof slh;
diff --git a/bin/varnishd/storage_malloc.c b/bin/varnishd/storage_malloc.c
index 0057867..f72cd48 100644
--- a/bin/varnishd/storage_malloc.c
+++ b/bin/varnishd/storage_malloc.c
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2010 Varnish Software AS
+ * Copyright (c) 2006-2011 Varnish Software AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
diff --git a/include/Makefile.am b/include/Makefile.am
index 6e07532..ac761d1 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -60,13 +60,13 @@ vcs_version.h: FORCE
H="$$(head -n 1 vcs_version.h 2>/dev/null || true)"; \
if [ "/* $$V */" != "$$H" ]; then \
( \
- echo "/* $$V */" ;\
echo '/*' ;\
echo ' * NB: This file is machine generated, DO NOT EDIT!' ;\
echo ' *' ;\
echo ' * Run make to regenerate' ;\
echo ' *' ;\
echo ' */' ;\
+ echo "/* $$V */" ;\
echo '' ;\
echo "#define VCS_Version \"$$V\"" \
) > vcs_version.h ; \
diff --git a/include/vsc_fields.h b/include/vsc_fields.h
index 0952698..c35acec 100644
--- a/include/vsc_fields.h
+++ b/include/vsc_fields.h
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2010 Varnish Software AS
+ * Copyright (c) 2006-2011 Varnish Software AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
diff --git a/lib/libvarnish/binary_heap.c b/lib/libvarnish/binary_heap.c
index c94cbfd..01a3c96 100644
--- a/lib/libvarnish/binary_heap.c
+++ b/lib/libvarnish/binary_heap.c
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2010 Varnish Software AS
+ * Copyright (c) 2006-2011 Varnish Software AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
@@ -561,11 +561,13 @@ main(int argc, char **argv)
CHECK_OBJ_NOTNULL(fp, FOO_MAGIC);
assert(fp->idx == 1);
- /* It cannot possibly be larger than the last value we added */
+ /*
+ * It cannot possibly be larger than the last
+ * value we added
+ */
assert(fp->key <= lr);
binheap_delete(bh, fp->idx);
-
-
+
n = fp->n;
ALLOC_OBJ(ff[n], FOO_MAGIC);
assert(ff[n] != NULL);
diff --git a/lib/libvarnish/cli_common.c b/lib/libvarnish/cli_common.c
index 604ab15..994bd9a 100644
--- a/lib/libvarnish/cli_common.c
+++ b/lib/libvarnish/cli_common.c
@@ -121,7 +121,7 @@ read_tmo(int fd, char *ptr, unsigned len, double tmo)
int i, j, to;
struct pollfd pfd;
- if (tmo > 0)
+ if (tmo > 0)
to = tmo * 1e3;
else
to = -1;
diff --git a/lib/libvarnishapi/vsl.c b/lib/libvarnishapi/vsl.c
index cc1fc0b..f4e633b 100644
--- a/lib/libvarnishapi/vsl.c
+++ b/lib/libvarnishapi/vsl.c
@@ -179,10 +179,10 @@ vsl_nextlog(struct vsl *vsl, uint32_t **pp)
vsl->log_ptr = vsl->log_start + 1;
VRMB();
continue;
- }
+ }
if (t == VSL_ENDMARKER) {
if (vsl->log_ptr != vsl->log_start + 1 &&
- vsl->last_seq != vsl->log_start[0]) {
+ vsl->last_seq != vsl->log_start[0]) {
/* ENDMARKER not at front and seq wrapped */
vsl->log_ptr = vsl->log_start + 1;
VRMB();
diff --git a/lib/libvcl/vcc_backend.c b/lib/libvcl/vcc_backend.c
index b896a7d..1b8f8a0 100644
--- a/lib/libvcl/vcc_backend.c
+++ b/lib/libvcl/vcc_backend.c
@@ -653,7 +653,7 @@ vcc_DefBackend(struct vcc *tl, const struct token *nm)
VSB_printf(tl->sb, "Backend %.*s redefined\n", PF(tl->t));
vcc_ErrWhere(tl, nm);
return;
- }
+ }
sym->fmt = BACKEND;
sym->eval = vcc_Eval_Backend;
sym->ndef++;
diff --git a/lib/libvcl/vcc_expr.c b/lib/libvcl/vcc_expr.c
index 9a504e5..0426299 100644
--- a/lib/libvcl/vcc_expr.c
+++ b/lib/libvcl/vcc_expr.c
@@ -454,7 +454,7 @@ vcc_Eval_Regsub(struct vcc *tl, struct expr **e, const struct symbol *sym)
SkipToken(tl, '(');
vcc_expr0(tl, &e2, STRING);
- if (e2->fmt != STRING)
+ if (e2->fmt != STRING)
vcc_expr_tostring(&e2, STRING);
SkipToken(tl, ',');
@@ -467,7 +467,7 @@ vcc_Eval_Regsub(struct vcc *tl, struct expr **e, const struct symbol *sym)
SkipToken(tl, ',');
vcc_expr0(tl, &e2, STRING);
- if (e2->fmt != STRING)
+ if (e2->fmt != STRING)
vcc_expr_tostring(&e2, STRING);
*e = vcc_expr_edit(STRING, "\v1, \v2)", *e, e2);
SkipToken(tl, ')');
diff --git a/lib/libvcl/vcc_string.c b/lib/libvcl/vcc_string.c
index ed91c35..f643a4b 100644
--- a/lib/libvcl/vcc_string.c
+++ b/lib/libvcl/vcc_string.c
@@ -1,6 +1,6 @@
/*-
* Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2010 Varnish Software AS
+ * Copyright (c) 2006-2011 Varnish Software AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
diff --git a/lib/libvmod_std/vmod.py b/lib/libvmod_std/vmod.py
index 56bddf2..83f8eca 100755
--- a/lib/libvmod_std/vmod.py
+++ b/lib/libvmod_std/vmod.py
@@ -255,7 +255,6 @@ if initname != "":
def file_header(fo):
fo.write("""/*
- *
* NB: This file is machine generated, DO NOT EDIT!
*
* Edit vmod.vcc and run vmod.py instead
More information about the varnish-commit
mailing list