[master] 0bb94ca Some style(9)

Federico G. Schwindt fgsch at lodoss.net
Wed Oct 12 15:57:04 CEST 2016


commit 0bb94ca79e347cbd4ef577984edc97581a33576c
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Wed Oct 12 09:07:36 2016 +0100

    Some style(9)

diff --git a/bin/varnishd/mgt/mgt_child.c b/bin/varnishd/mgt/mgt_child.c
index 9264f65..8bba5b7 100644
--- a/bin/varnishd/mgt/mgt_child.c
+++ b/bin/varnishd/mgt/mgt_child.c
@@ -454,7 +454,8 @@ mgt_launch_child(struct cli *cli)
  */
 
 static int
-kill_child(void) {
+kill_child(void)
+{
 	int i, error;
 
 	VJ_master(JAIL_MASTER_KILL);
diff --git a/bin/varnishd/mgt/mgt_cli.c b/bin/varnishd/mgt/mgt_cli.c
index b16597d..84a853a 100644
--- a/bin/varnishd/mgt/mgt_cli.c
+++ b/bin/varnishd/mgt/mgt_cli.c
@@ -174,7 +174,8 @@ static struct cli_proto cli_askchild[] = {
  */
 
 int
-mgt_cli_askchild(unsigned *status, char **resp, const char *fmt, ...) {
+mgt_cli_askchild(unsigned *status, char **resp, const char *fmt, ...)
+{
 	int i, j;
 	va_list ap;
 	unsigned u;
diff --git a/bin/varnishd/mgt/mgt_jail_solaris.c b/bin/varnishd/mgt/mgt_jail_solaris.c
index 1723e3e..a9a624e 100644
--- a/bin/varnishd/mgt/mgt_jail_solaris.c
+++ b/bin/varnishd/mgt/mgt_jail_solaris.c
@@ -262,7 +262,8 @@ vjs_init(char **args)
 
 /* for priv_delset() and priv_addset() */
 static inline int
-priv_setop_check(int a) {
+priv_setop_check(int a)
+{
 	if (a == 0)
 		return (1);
 	if (errno == EINVAL)
@@ -280,7 +281,8 @@ priv_setop_check(int a) {
 
 /* for setppriv */
 static inline int
-setppriv_check(int a) {
+setppriv_check(int a)
+{
 	if (a == 0)
 		return (1);
 	if (errno == EPERM)
diff --git a/bin/varnishd/waiter/cache_waiter_ports.c b/bin/varnishd/waiter/cache_waiter_ports.c
index 3b4f59c..f208f8a 100644
--- a/bin/varnishd/waiter/cache_waiter_ports.c
+++ b/bin/varnishd/waiter/cache_waiter_ports.c
@@ -107,7 +107,8 @@ vws_del(struct vws *vws, int fd)
 }
 
 static inline void
-vws_port_ev(struct vws *vws, struct waiter *w, port_event_t *ev, double now) {
+vws_port_ev(struct vws *vws, struct waiter *w, port_event_t *ev, double now)
+{
 	struct waited *wp;
 	if(ev->portev_source == PORT_SOURCE_USER) {
 		CAST_OBJ_NOTNULL(wp, ev->portev_user, WAITED_MAGIC);
diff --git a/bin/varnishtest/vtc_http2.c b/bin/varnishtest/vtc_http2.c
index b4cb96f..f1b5360 100644
--- a/bin/varnishtest/vtc_http2.c
+++ b/bin/varnishtest/vtc_http2.c
@@ -559,7 +559,8 @@ parse_prio(struct stream *s, struct frame *f)
 }
 
 static void
-parse_rst(const struct stream *s, struct frame *f) {
+parse_rst(const struct stream *s, struct frame *f)
+{
 	struct http *hp;
 	uint32_t err;
 	const char *buf;
@@ -2059,7 +2060,8 @@ cmd_txwinup(CMD_ARGS)
 }
 
 static struct frame *
-rxstuff(struct stream *s) {
+rxstuff(struct stream *s)
+{
 	struct frame *f;
 
 	CHECK_OBJ_NOTNULL(s, STREAM_MAGIC);
@@ -2284,7 +2286,8 @@ cmd_rxreqsp(CMD_ARGS)
  *
  */
 static void
-cmd_rxpush(CMD_ARGS) {
+cmd_rxpush(CMD_ARGS)
+{
 	struct stream *s;
 	struct frame *f = NULL;
 	char *p;
@@ -2374,7 +2377,8 @@ RXFUNC(winup,	WINDOW_UPDATE)
  * Receive a frame, any frame.
  */
 static void
-cmd_rxframe(CMD_ARGS) {
+cmd_rxframe(CMD_ARGS)
+{
 	struct stream *s;
 	(void)cmd;
 	(void)vl;
diff --git a/include/vbm.h b/include/vbm.h
index 94497ab..f56447d 100644
--- a/include/vbm.h
+++ b/include/vbm.h
@@ -44,7 +44,8 @@
 #define VBITMAP_BIT(n)	(1U << ((n) % VBITMAP_WORD))
 
 static inline unsigned
-vbit_rndup(unsigned bit, unsigned to) {
+vbit_rndup(unsigned bit, unsigned to)
+{
 	bit += to - 1;
 	bit -= (bit % to);
 
diff --git a/lib/libvmod_directors/vmod_shard.c b/lib/libvmod_directors/vmod_shard.c
index 52c9710..031e364 100644
--- a/lib/libvmod_directors/vmod_shard.c
+++ b/lib/libvmod_directors/vmod_shard.c
@@ -104,7 +104,8 @@ VCL_INT __match_proto__(td_directors_shard_key)
 
 VCL_VOID __match_proto__(td_directors_set_warmup)
 vmod_shard_set_warmup(VRT_CTX, struct vmod_directors_shard *vshard,
-    VCL_REAL probability) {
+    VCL_REAL probability)
+{
 	CHECK_OBJ_NOTNULL(vshard, VMOD_SHARD_SHARD_MAGIC);
 	if (probability < 0 || probability >= 1) {
 		shard_err(ctx, vshard->shardd,



More information about the varnish-commit mailing list