[4.1] a3282ae Remove superfluous returns

[Federico G. Schwindt]

commit a3282aed553c7265fbe6111fc49c4008992c28f6
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Thu Sep 3 21:15:27 2015 +0100

    Remove superfluous returns

diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index 139e18b..c747ead 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -567,7 +567,6 @@ ccf_config_load(struct cli *cli, const char * const *av, void *priv)
 	ASSERT_CLI();
 	if (VCL_Load(cli, av[2], av[3], av[4]))
 		VCLI_SetResult(cli, CLIS_PARAM);
-	return;
 }
 
 static void __match_proto__(cli_func_t)
@@ -640,7 +639,6 @@ ccf_config_use(struct cli *cli, const char * const *av, void *priv)
 		Lck_Unlock(&vcl_mtx);
 	}
 	VSB_delete(vsb);
-	return;
 }
 
 static void __match_proto__(cli_func_t)
diff --git a/bin/varnishd/hash/hash_classic.c b/bin/varnishd/hash/hash_classic.c
index 9121ec1..ef817ea 100644
--- a/bin/varnishd/hash/hash_classic.c
+++ b/bin/varnishd/hash/hash_classic.c
@@ -78,7 +78,6 @@ hcl_init(int ac, char * const *av)
 	}
 	hcl_nhash = u;
 	fprintf(stderr, "Classic hash: %u buckets\n", hcl_nhash);
-	return;
 }
 
 /*--------------------------------------------------------------------
diff --git a/bin/varnishd/http1/cache_http1_deliver.c b/bin/varnishd/http1/cache_http1_deliver.c
index c931971..5d4e4f2 100644
--- a/bin/varnishd/http1/cache_http1_deliver.c
+++ b/bin/varnishd/http1/cache_http1_deliver.c
@@ -59,7 +59,8 @@ v1d_bytes(struct req *req, enum vdp_action act, void **priv,
 }
 
 static void
-v1d_error(struct req *req, const char *msg) {
+v1d_error(struct req *req, const char *msg)
+{
         static const char r_500[] =
                 "HTTP/1.1 500 Internal Server Error\r\n"
                 "Server: Varnish\r\n"
@@ -72,7 +73,6 @@ v1d_error(struct req *req, const char *msg) {
 
 	(void)write(req->sp->fd, r_500, sizeof r_500 - 1);
 	req->doclose = SC_TX_EOF;
-	return;
 }
 
 /*--------------------------------------------------------------------
diff --git a/bin/varnishd/http1/cache_http1_line.c b/bin/varnishd/http1/cache_http1_line.c
index 04d2533..9c49fca 100644
--- a/bin/varnishd/http1/cache_http1_line.c
+++ b/bin/varnishd/http1/cache_http1_line.c
@@ -106,7 +106,6 @@ V1L_Reserve(struct worker *wrk, struct ws *ws, int *fd, struct vsl_log *vsl,
 	v1l->t0 = t0;
 	v1l->vsl = vsl;
 	wrk->v1l = v1l;
-	return;
 }
 
 unsigned
diff --git a/bin/varnishd/proxy/cache_proxy_proto.c b/bin/varnishd/proxy/cache_proxy_proto.c
index d029861..433581e 100644
--- a/bin/varnishd/proxy/cache_proxy_proto.c
+++ b/bin/varnishd/proxy/cache_proxy_proto.c
@@ -381,5 +381,4 @@ VPX_Proto_Sess(struct worker *wrk, void *priv)
 	req->sp->sess_step = S_STP_H1NEWREQ;
 	wrk->task.func = SES_Proto_Req;
 	wrk->task.priv = req;
-	return;
 }
diff --git a/bin/varnishd/waiter/cache_waiter_ports.c b/bin/varnishd/waiter/cache_waiter_ports.c
index 0a647ef..f9e3b52 100644
--- a/bin/varnishd/waiter/cache_waiter_ports.c
+++ b/bin/varnishd/waiter/cache_waiter_ports.c
@@ -131,7 +131,6 @@ vws_port_ev(struct vws *vws, struct waiter *w, port_event_t *ev, double now) {
 		    WAITER_REMCLOSE : WAITER_ACTION,
 		    now);
 	}
-	return;
 }
 
 static void *
diff --git a/lib/libvarnishapi/vxp_parse.c b/lib/libvarnishapi/vxp_parse.c
index 9559016..ce4c2eb 100644
--- a/lib/libvarnishapi/vxp_parse.c
+++ b/lib/libvarnishapi/vxp_parse.c
@@ -397,7 +397,6 @@ vxp_expr_not(struct vxp *vxp, struct vex **pvex)
 	}
 
 	vxp_expr_group(vxp, pvex);
-	return;
 }
 
 /*
diff --git a/lib/libvcc/vcc_action.c b/lib/libvcc/vcc_action.c
index ea3e679..4a026b0 100644
--- a/lib/libvcc/vcc_action.c
+++ b/lib/libvcc/vcc_action.c
@@ -49,7 +49,6 @@ parse_call(struct vcc *tl)
 	Fb(tl, 1, "if (VGC_function_%.*s(ctx))\n", PF(tl->t));
 	Fb(tl, 1, "\treturn (1);\n");
 	vcc_NextToken(tl);
-	return;
 }
 
 /*--------------------------------------------------------------------*/
diff --git a/lib/libvcc/vcc_backend_util.c b/lib/libvcc/vcc_backend_util.c
index de361a5..c079b20 100644
--- a/lib/libvcc/vcc_backend_util.c
+++ b/lib/libvcc/vcc_backend_util.c
@@ -117,7 +117,6 @@ vcc_IsField(struct vcc *tl, struct token **t, struct fld_spec *fs)
 	vcc_ErrToken(tl, t_field);
 	VSB_printf(tl->sb, " at\n");
 	vcc_ErrWhere(tl, t_field);
-	return;
 }
 
 void