[master] 208fb45 Whitespace OCD
Federico G. Schwindt
fgsch at lodoss.net
Thu Nov 30 23:17:08 UTC 2017
commit 208fb45005f5e7665d92516f1cdae20998c8d9d3
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date: Thu Nov 30 16:42:39 2017 +0000
Whitespace OCD
diff --git a/bin/varnishd/http1/cache_http1_deliver.c b/bin/varnishd/http1/cache_http1_deliver.c
index f4bfb03..b1b8627 100644
--- a/bin/varnishd/http1/cache_http1_deliver.c
+++ b/bin/varnishd/http1/cache_http1_deliver.c
@@ -145,13 +145,13 @@ V1D_Deliver(struct req *req, struct boc *boc, int sendbody)
if (DO_DEBUG(DBG_FLUSH_HEAD))
(void)V1L_Flush(req->wrk);
- if (! sendbody || req->res_mode & RES_ESI)
+ if (!sendbody || req->res_mode & RES_ESI)
if (V1L_Close(req->wrk) && req->sp->fd >= 0) {
Req_Fail(req, SC_REM_CLOSE);
sendbody = 0;
}
- if (! sendbody) {
+ if (!sendbody) {
AZ(req->wrk->v1l);
VDP_close(req);
return;
diff --git a/bin/varnishd/proxy/cache_proxy_proto.c b/bin/varnishd/proxy/cache_proxy_proto.c
index 629a013..fbef883 100644
--- a/bin/varnishd/proxy/cache_proxy_proto.c
+++ b/bin/varnishd/proxy/cache_proxy_proto.c
@@ -467,7 +467,7 @@ VPX_Send_Proxy(int fd, int version, const struct sess *sp)
AZ(VSB_finish(vsb));
(void)write(fd, VSB_data(vsb), VSB_len(vsb));
- if (! DO_DEBUG(DBG_PROTOCOL)) {
+ if (!DO_DEBUG(DBG_PROTOCOL)) {
VSB_delete(vsb);
return;
}
diff --git a/doc/sphinx/phk/apispaces.rst b/doc/sphinx/phk/apispaces.rst
index d561a14..5da87e6 100644
--- a/doc/sphinx/phk/apispaces.rst
+++ b/doc/sphinx/phk/apispaces.rst
@@ -98,7 +98,7 @@ This API space could also have been called 'inline', because it
is basically what you see in the C-source generated by VCC:
| Include files allowed:
-|
+|
| ``#include "vdef.h"``
| ``#include "vrt.h"``
| ``#include "vrt_obj.h"``
@@ -125,7 +125,7 @@ This API space provides access to everything in the ``VRT`` API
space plus the other exposed and supported APIs in varnishd.
| Include files allowed:
-|
+|
| ``#include "cache.h" // NB: includes vdef.h and vrt.h``
| ``#include "cache_backend.h"``
| ``#include "cache_director.h"``
diff --git a/doc/sphinx/whats-new/changes-5.2.rst b/doc/sphinx/whats-new/changes-5.2.rst
index 43764b3..6834325 100644
--- a/doc/sphinx/whats-new/changes-5.2.rst
+++ b/doc/sphinx/whats-new/changes-5.2.rst
@@ -46,7 +46,7 @@ See :ref:`vmod_purge(3)`.
VMOD vtc
--------
-As long as we have had VMODs, we had an internal vmod called ``vmod_debug``
+As long as we have had VMODs, we had an internal vmod called ``vmod_debug``
which was used with ``varnishtest`` to exercise the VMOD related parts of
``varnishd``. Over time this vmod grew other useful functions for writing
test-cases.
diff --git a/lib/libvarnish/binary_heap.c b/lib/libvarnish/binary_heap.c
index d537c94..88c85d4 100644
--- a/lib/libvarnish/binary_heap.c
+++ b/lib/libvarnish/binary_heap.c
@@ -537,7 +537,7 @@ main(int argc, char **argv)
child(bh, n + 1, &u, &v);
}
- for(j = 0; j < 2; j++) {
+ for (j = 0; j < 2; j++) {
/* First insert our N elements */
for (u = 0; u < N; u++) {
lr = VRND_RandomTestable() % R;
diff --git a/lib/libvarnish/vcli_serve.c b/lib/libvarnish/vcli_serve.c
index 689553d..a5e6714 100644
--- a/lib/libvarnish/vcli_serve.c
+++ b/lib/libvarnish/vcli_serve.c
@@ -339,7 +339,7 @@ cls_feed(struct VCLS_fd *cfd, const char *p, const char *e)
cli = cfd->cli;
CHECK_OBJ_NOTNULL(cli, CLI_MAGIC);
- for(;p < e; p++) {
+ for (;p < e; p++) {
if (cli->cmd == NULL && isspace(*p)) {
/* Ignore all leading space before cmd */
continue;
diff --git a/lib/libvarnishapi/vsc.c b/lib/libvarnishapi/vsc.c
index 155c675..45a159a 100644
--- a/lib/libvarnishapi/vsc.c
+++ b/lib/libvarnishapi/vsc.c
@@ -301,7 +301,7 @@ vsc_del_seg(const struct vsc *vsc, struct vsm *vsm, struct vsc_seg *sp)
AZ(VSM_Unmap(vsm, sp->fantom));
vjsn_delete(&sp->vj);
pp = sp->points;
- for(u = 0; u < sp->npoints; u++, pp++) {
+ for (u = 0; u < sp->npoints; u++, pp++) {
if (vsc->fdestroy != NULL)
vsc->fdestroy(vsc->priv, &pp->point);
vsc_clean_point(pp);
@@ -381,7 +381,7 @@ vsc_iter_seg(const struct vsc *vsc, const struct vsc_seg *sp,
CHECK_OBJ_NOTNULL(sp, VSC_SEG_MAGIC);
AN(fiter);
pp = sp->points;
- for(u = 0; u < sp->npoints && i == 0; u++, pp++) {
+ for (u = 0; u < sp->npoints && i == 0; u++, pp++) {
if (pp->name != NULL)
i = fiter(priv, &pp->point);
}
diff --git a/lib/libvarnishapi/vsl_arg.c b/lib/libvarnishapi/vsl_arg.c
index 5d69798..b4bef5a 100644
--- a/lib/libvarnishapi/vsl_arg.c
+++ b/lib/libvarnishapi/vsl_arg.c
@@ -96,7 +96,7 @@ VSL_Glob2Tags(const char *glob, int l, VSL_tagfind_f *func, void *priv)
if (glob == e)
return (-1); // Empty pattern cannot match
- for(p = glob; p < e; p++)
+ for (p = glob; p < e; p++)
if (*p == '*')
break;
@@ -119,7 +119,7 @@ VSL_Glob2Tags(const char *glob, int l, VSL_tagfind_f *func, void *priv)
l2 = e - p2;
}
- for(p++; p < e; p++)
+ for (p++; p < e; p++)
if (*p == '*')
return (-3); // More than one wildcard
diff --git a/lib/libvmod_blob/url.c b/lib/libvmod_blob/url.c
index 7babb18..8ba47fc 100644
--- a/lib/libvmod_blob/url.c
+++ b/lib/libvmod_blob/url.c
@@ -137,7 +137,7 @@ url_decode(const enum encoding dec, char *restrict const buf,
while (*s && len) {
uint8_t nib2;
- switch(state) {
+ switch (state) {
case NORMAL:
if (*s == '%')
state = PERCENT;
diff --git a/lib/libvmod_blob/vmod_blob.c b/lib/libvmod_blob/vmod_blob.c
index a509b34..927af20 100644
--- a/lib/libvmod_blob/vmod_blob.c
+++ b/lib/libvmod_blob/vmod_blob.c
@@ -141,7 +141,7 @@ decode_l_va(enum encoding dec, const char * const p, va_list ap)
static void
err_decode(VRT_CTX, const char *enc)
{
- switch(errno) {
+ switch (errno) {
case EINVAL:
ERRINVAL(ctx, enc);
break;
@@ -156,7 +156,7 @@ err_decode(VRT_CTX, const char *enc)
static inline enum case_e
parse_case(VCL_ENUM case_s)
{
- switch(*case_s) {
+ switch (*case_s) {
case 'D':
AZ(strcmp(case_s + 1, "EFAULT"));
return DEFAULT;
More information about the varnish-commit
mailing list