r4556 - in trunk/varnish-cache: bin/varnishd bin/varnishtest lib/libvarnish lib/libvarnishapi lib/libvcl
phk at projects.linpro.no
phk at projects.linpro.no
Fri Feb 12 12:42:03 CET 2010
Author: phk
Date: 2010-02-12 12:42:03 +0100 (Fri, 12 Feb 2010)
New Revision: 4556
Modified:
trunk/varnish-cache/bin/varnishd/cache_backend.c
trunk/varnish-cache/bin/varnishd/cache_center.c
trunk/varnish-cache/bin/varnishd/cache_dir_random.c
trunk/varnish-cache/bin/varnishd/cache_response.c
trunk/varnish-cache/bin/varnishd/cache_session.c
trunk/varnish-cache/bin/varnishd/cache_waiter_poll.c
trunk/varnish-cache/bin/varnishd/mgt_cli.c
trunk/varnish-cache/bin/varnishd/mgt_param.c
trunk/varnish-cache/bin/varnishd/stevedore.h
trunk/varnish-cache/bin/varnishtest/vtc_server.c
trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
trunk/varnish-cache/lib/libvarnish/cli_serve.c
trunk/varnish-cache/lib/libvarnish/time.c
trunk/varnish-cache/lib/libvarnish/vss.c
trunk/varnish-cache/lib/libvarnishapi/shmlog.c
trunk/varnish-cache/lib/libvcl/vcc_backend.c
Log:
White-space cleanup
Modified: trunk/varnish-cache/bin/varnishd/cache_backend.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_backend.c 2010-02-12 11:26:56 UTC (rev 4555)
+++ trunk/varnish-cache/bin/varnishd/cache_backend.c 2010-02-12 11:42:03 UTC (rev 4556)
@@ -99,8 +99,8 @@
if (dst == 0.0) \
dst = params->tmx; \
} while (0)
-
+
/*--------------------------------------------------------------------
* Attempt to connect to a given addrinfo entry.
*
Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c 2010-02-12 11:26:56 UTC (rev 4555)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c 2010-02-12 11:42:03 UTC (rev 4556)
@@ -1218,7 +1218,7 @@
TCP_blocking(sp->fd);
/*
- * NB: Once done is set, we can no longer touch sp!
+ * NB: Once done is set, we can no longer touch sp!
*/
for (done = 0; !done; ) {
assert(sp->wrk == w);
Modified: trunk/varnish-cache/bin/varnishd/cache_dir_random.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_dir_random.c 2010-02-12 11:26:56 UTC (rev 4555)
+++ trunk/varnish-cache/bin/varnishd/cache_dir_random.c 2010-02-12 11:42:03 UTC (rev 4556)
@@ -119,7 +119,7 @@
}
/*
- * If we are hashing, first try to hit our "canonical backend"
+ * If we are hashing, first try to hit our "canonical backend"
* If that fails, we fall through, and select a weighted backend
* amongst the healthy set.
*/
Modified: trunk/varnish-cache/bin/varnishd/cache_response.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_response.c 2010-02-12 11:26:56 UTC (rev 4555)
+++ trunk/varnish-cache/bin/varnishd/cache_response.c 2010-02-12 11:42:03 UTC (rev 4556)
@@ -151,7 +151,7 @@
if(sp->http->protover >= 1.1)
http_PrintfHeader(sp->wrk, sp->fd, sp->wrk->resp,
"Transfer-Encoding: chunked");
- else
+ else
sp->doclose = "ESI EOF";
}
Modified: trunk/varnish-cache/bin/varnishd/cache_session.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_session.c 2010-02-12 11:26:56 UTC (rev 4555)
+++ trunk/varnish-cache/bin/varnishd/cache_session.c 2010-02-12 11:42:03 UTC (rev 4556)
@@ -95,7 +95,7 @@
}
/*--------------------------------------------------------------------
- * This function allocates a session + assorted peripheral data
+ * This function allocates a session + assorted peripheral data
* structures in one single malloc operation.
*/
Modified: trunk/varnish-cache/bin/varnishd/cache_waiter_poll.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_waiter_poll.c 2010-02-12 11:26:56 UTC (rev 4555)
+++ trunk/varnish-cache/bin/varnishd/cache_waiter_poll.c 2010-02-12 11:42:03 UTC (rev 4556)
@@ -130,7 +130,7 @@
v = poll(pollfd, hpoll + 1, 100);
assert(v >= 0);
if (v && pollfd[vca_pipes[0]].revents) {
-
+
if (pollfd[vca_pipes[0]].revents != POLLIN)
VSL(SLT_Debug, 0, "pipe.revents= 0x%x",
pollfd[vca_pipes[0]].revents);
Modified: trunk/varnish-cache/bin/varnishd/mgt_cli.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_cli.c 2010-02-12 11:26:56 UTC (rev 4555)
+++ trunk/varnish-cache/bin/varnishd/mgt_cli.c 2010-02-12 11:42:03 UTC (rev 4556)
@@ -172,7 +172,7 @@
"(child not running).\n"
"Type 'help' for more info.");
return;
- }
+ }
AN(cli->cmd);
i = write(cli_o, cli->cmd, strlen(cli->cmd));
if (i != strlen(cli->cmd)) {
@@ -186,7 +186,7 @@
cli_out(cli, "CLI communication error");
return;
}
-
+
assert(i == 1 || errno == EPIPE);
(void)cli_readres(cli_i,
&u, &q, params->cli_timeout);
@@ -418,7 +418,7 @@
(void)ident;
(void)verbose;
- if (cls == NULL)
+ if (cls == NULL)
mgt_cli_init_cls();
cli = CLS_AddFd(cls, fdi, fdo, closefunc, priv);
@@ -654,7 +654,7 @@
M_conn = vev_new();
AN(M_conn);
M_conn->callback = Marg_poker;
- M_conn->name = "-M connector";
+ M_conn->name = "-M connector";
M_conn->fd_flags = EV_WR;
M_conn->fd = s;
M_fd = s;
@@ -682,6 +682,6 @@
AN(M_poker);
M_poker->timeout = M_poll;
M_poker->callback = Marg_poker;
- M_poker->name = "-M poker";
+ M_poker->name = "-M poker";
AZ(vev_add(mgt_evb, M_poker));
}
Modified: trunk/varnish-cache/bin/varnishd/mgt_param.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_param.c 2010-02-12 11:26:56 UTC (rev 4555)
+++ trunk/varnish-cache/bin/varnishd/mgt_param.c 2010-02-12 11:42:03 UTC (rev 4556)
@@ -1056,7 +1056,7 @@
}
printf(".Pp\n");
for (p = pp->descr; *p; p++) {
- if (*p == '\n' && p[1] =='\0')
+ if (*p == '\n' && p[1] =='\0')
break;
if (*p == '\n' && p[1] =='\n') {
printf("\n.Pp\n");
Modified: trunk/varnish-cache/bin/varnishd/stevedore.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/stevedore.h 2010-02-12 11:26:56 UTC (rev 4555)
+++ trunk/varnish-cache/bin/varnishd/stevedore.h 2010-02-12 11:42:03 UTC (rev 4556)
@@ -65,7 +65,7 @@
VTAILQ_ENTRY(stevedore) list;
};
-struct object *STV_NewObject(struct sess *sp, unsigned len, double ttl,
+struct object *STV_NewObject(struct sess *sp, unsigned len, double ttl,
unsigned nhttp);
struct storage *STV_alloc(struct sess *sp, size_t size, struct objcore *oc);
void STV_trim(struct storage *st, size_t size);
Modified: trunk/varnish-cache/bin/varnishtest/vtc_server.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_server.c 2010-02-12 11:26:56 UTC (rev 4555)
+++ trunk/varnish-cache/bin/varnishtest/vtc_server.c 2010-02-12 11:42:03 UTC (rev 4556)
@@ -278,10 +278,10 @@
continue;
}
/*
- * We do an implict -wait if people muck about with a
+ * We do an implict -wait if people muck about with a
* running server.
*/
- if (s->run)
+ if (s->run)
server_wait(s);
assert(s->run == 0);
Modified: trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_varnish.c 2010-02-12 11:26:56 UTC (rev 4555)
+++ trunk/varnish-cache/bin/varnishtest/vtc_varnish.c 2010-02-12 11:42:03 UTC (rev 4556)
@@ -309,10 +309,10 @@
vtc_log(v->vl, 0, "FAIL no CLI connection accepted");
return;
}
-
+
AZ(close(v->cli_fd));
v->cli_fd = nfd;
-
+
vtc_log(v->vl, 3, "CLI connection fd = %d", v->cli_fd);
assert(v->cli_fd >= 0);
@@ -345,20 +345,20 @@
u = varnish_ask_cli(v, "start", &resp);
if (vtc_error)
return;
- if (u != CLIS_OK)
+ if (u != CLIS_OK)
vtc_log(v->vl, 0, "CLI start command failed: %u %s", u, resp);
free(resp);
u = varnish_ask_cli(v, "debug.xid 1000", &resp);
if (vtc_error)
return;
- if (u != CLIS_OK)
+ if (u != CLIS_OK)
vtc_log(v->vl, 0, "CLI debug.xid command failed: %u %s",
u, resp);
free(resp);
u = varnish_ask_cli(v, "debug.listen_address", &resp);
if (vtc_error)
return;
- if (u != CLIS_OK)
+ if (u != CLIS_OK)
vtc_log(v->vl, 0,
"CLI debug.listen_address command failed: %u %s", u, resp);
h = resp;
Modified: trunk/varnish-cache/lib/libvarnish/cli_serve.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/cli_serve.c 2010-02-12 11:26:56 UTC (rev 4555)
+++ trunk/varnish-cache/lib/libvarnish/cli_serve.c 2010-02-12 11:42:03 UTC (rev 4556)
@@ -50,7 +50,7 @@
#include <cli_serve.h>
#include <libvarnish.h>
#include <miniobj.h>
-
+
struct cls_func {
unsigned magic;
#define CLS_FUNC_MAGIC 0x7d280c9b
@@ -81,7 +81,7 @@
};
/*--------------------------------------------------------------------*/
-
+
void
CLS_func_close(struct cli *cli, const char *const *av, void *priv)
{
@@ -262,7 +262,7 @@
av = ParseArgv(p, 0);
AN(av);
- cli->result = CLIS_UNKNOWN;
+ cli->result = CLIS_UNKNOWN;
vsb_clear(cli->sb);
cli_out(cli, "Unknown request.\nType 'help' for more info.\n");
@@ -355,7 +355,7 @@
static void
cls_close_fd(struct cls *cs, struct cls_fd *cfd)
{
-
+
CHECK_OBJ_NOTNULL(cs, CLS_MAGIC);
CHECK_OBJ_NOTNULL(cfd, CLS_FD_MAGIC);
@@ -482,7 +482,7 @@
cs = *csp;
*csp = NULL;
CHECK_OBJ_NOTNULL(cs, CLS_MAGIC);
- VTAILQ_FOREACH_SAFE(cfd, &cs->fds, list, cfd2)
+ VTAILQ_FOREACH_SAFE(cfd, &cs->fds, list, cfd2)
cls_close_fd(cs, cfd);
while (!VTAILQ_EMPTY(&cs->funcs)) {
Modified: trunk/varnish-cache/lib/libvarnish/time.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/time.c 2010-02-12 11:26:56 UTC (rev 4555)
+++ trunk/varnish-cache/lib/libvarnish/time.c 2010-02-12 11:42:03 UTC (rev 4556)
@@ -250,7 +250,7 @@
exit (2);
}
}
-
+
int
main(int argc, char **argv)
{
Modified: trunk/varnish-cache/lib/libvarnish/vss.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/vss.c 2010-02-12 11:26:56 UTC (rev 4555)
+++ trunk/varnish-cache/lib/libvarnish/vss.c 2010-02-12 11:42:03 UTC (rev 4556)
@@ -249,7 +249,7 @@
perror("socket()");
return (-1);
}
- if (nonblock)
+ if (nonblock)
TCP_nonblocking(sd);
i = connect(sd, &va->va_addr.sa, va->va_addrlen);
if (i == 0 || (nonblock && errno == EINPROGRESS))
Modified: trunk/varnish-cache/lib/libvarnishapi/shmlog.c
===================================================================
--- trunk/varnish-cache/lib/libvarnishapi/shmlog.c 2010-02-12 11:26:56 UTC (rev 4555)
+++ trunk/varnish-cache/lib/libvarnishapi/shmlog.c 2010-02-12 11:42:03 UTC (rev 4556)
@@ -81,8 +81,8 @@
* These two bitmaps mark fd's as belonging to client or backend
* transactions respectively.
*/
- struct vbitmap *vbm_client;
- struct vbitmap *vbm_backend;
+ struct vbitmap *vbm_client;
+ struct vbitmap *vbm_backend;
/*
* Bit map of programatically selected tags, that cannot be suppressed.
Modified: trunk/varnish-cache/lib/libvcl/vcc_backend.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_backend.c 2010-02-12 11:26:56 UTC (rev 4555)
+++ trunk/varnish-cache/lib/libvcl/vcc_backend.c 2010-02-12 11:42:03 UTC (rev 4556)
@@ -190,7 +190,7 @@
*/
static void
-vcc_EmitBeIdent(const struct tokenlist *tl, struct vsb *v,
+vcc_EmitBeIdent(const struct tokenlist *tl, struct vsb *v,
int serial, const struct token *first, const struct token *last)
{
@@ -833,7 +833,7 @@
Fi(tl, 0, "\t VGC_backend__%.*s, &vgc_dir_priv_%.*s);\n",
PF(tl->t_dir), PF(tl->t_dir));
-
+
}
if (tl->err) {
vsb_printf(tl->sb,
More information about the varnish-commit
mailing list