[6.0] 688e657a6 Whitespace and style OCD
Dridi Boukelmoune
dridi.boukelmoune at gmail.com
Thu Aug 16 08:52:42 UTC 2018
commit 688e657a62d91ee21172d4fe29be2466e34689dd
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date: Fri Apr 13 10:23:21 2018 +0100
Whitespace and style OCD
diff --git a/bin/varnishtest/vtc_barrier.c b/bin/varnishtest/vtc_barrier.c
index 25bdfda24..c66b8a2cd 100644
--- a/bin/varnishtest/vtc_barrier.c
+++ b/bin/varnishtest/vtc_barrier.c
@@ -277,8 +277,7 @@ barrier_cond_sync(struct barrier *b, struct vtclog *vl)
if (++b->waiters == b->expected) {
vtc_log(vl, 4, "Barrier(%s) wake %u", b->name, b->expected);
AZ(pthread_cond_broadcast(&b->cond));
- }
- else {
+ } else {
vtc_log(vl, 4, "Barrier(%s) wait %u of %u",
b->name, b->waiters, b->expected);
AZ(pthread_cond_wait(&b->cond, &b->mtx));
diff --git a/bin/varnishtest/vtc_http.c b/bin/varnishtest/vtc_http.c
index 2c0b761b4..db07d42c9 100644
--- a/bin/varnishtest/vtc_http.c
+++ b/bin/varnishtest/vtc_http.c
@@ -1901,8 +1901,7 @@ http_process(struct vtclog *vl, const char *spec, int sock, int *sfd,
VTCP_hisname(sock, hp->rem_ip, VTCP_ADDRBUFSIZE, hp->rem_port,
VTCP_PORTBUFSIZE);
hp->rem_path = NULL;
- }
- else {
+ } else {
strcpy(hp->rem_ip, "0.0.0.0");
strcpy(hp->rem_port, "0");
hp->rem_path = strdup(addr);
diff --git a/bin/varnishtest/vtc_process.c b/bin/varnishtest/vtc_process.c
index af6da006a..b05d0ce28 100644
--- a/bin/varnishtest/vtc_process.c
+++ b/bin/varnishtest/vtc_process.c
@@ -730,9 +730,8 @@ process_kill(struct process *p, const char *sig)
if (kill(-pid, j) < 0)
vtc_fatal(p->vl, "Failed to send signal %d (%s)",
j, strerror(errno));
- else {
+ else
vtc_log(p->vl, 4, "Sent signal %d", j);
- }
}
/**********************************************************************
diff --git a/lib/libvcc/vcc_utils.c b/lib/libvcc/vcc_utils.c
index 987eb9829..33e2aa6a2 100644
--- a/lib/libvcc/vcc_utils.c
+++ b/lib/libvcc/vcc_utils.c
@@ -283,7 +283,7 @@ Emit_UDS_Path(struct vcc *tl, const struct token *t_path, const char *errid)
vcc_ErrWhere(tl, t_path);
return;
}
- if (! S_ISSOCK(st.st_mode)) {
+ if (!S_ISSOCK(st.st_mode)) {
VSB_printf(tl->sb, "%s: Not a socket:\n", errid);
vcc_ErrWhere(tl, t_path);
return;
diff --git a/lib/libvmod_debug/vmod_debug_dyn.c b/lib/libvmod_debug/vmod_debug_dyn.c
index 17b0da291..75dda136b 100644
--- a/lib/libvmod_debug/vmod_debug_dyn.c
+++ b/lib/libvmod_debug/vmod_debug_dyn.c
@@ -200,7 +200,7 @@ dyn_uds_init(VRT_CTX, struct xyzzy_debug_dyn_uds *uds, VCL_STRING path)
VRT_fail(ctx, "Cannot stat path %s: %s", path, strerror(errno));
return (-1);
}
- if (! S_ISSOCK(st.st_mode)) {
+ if (!S_ISSOCK(st.st_mode)) {
VRT_fail(ctx, "%s is not a socket", path);
return (-1);
}
diff --git a/lib/libvmod_unix/cred_compat.h b/lib/libvmod_unix/cred_compat.h
index 843793a75..cd4fd7437 100644
--- a/lib/libvmod_unix/cred_compat.h
+++ b/lib/libvmod_unix/cred_compat.h
@@ -95,7 +95,7 @@ get_ids(int fd, uid_t *uid, gid_t *gid)
priv_set_t *priv = NULL;
errno = 0;
- if (! priv_ineffect(PRIV_PROC_INFO)) {
+ if (!priv_ineffect(PRIV_PROC_INFO)) {
priv = priv_proc_info;
if (setppriv(PRIV_ON, PRIV_EFFECTIVE, priv))
return (CREDS_FAIL);
diff --git a/lib/libvmod_unix/vmod_unix.c b/lib/libvmod_unix/vmod_unix.c
index f51c10883..59bbb2d8e 100644
--- a/lib/libvmod_unix/vmod_unix.c
+++ b/lib/libvmod_unix/vmod_unix.c
@@ -94,7 +94,7 @@ vmod_##func(VRT_CTX) \
} \
\
sp = get_sp(ctx); \
- if (! sp->listen_sock->uds) { \
+ if (!sp->listen_sock->uds) { \
ERRNOTUDS(ctx); \
return (-1); \
} \
More information about the varnish-commit
mailing list