[4.0] 6df57da Things you can do while hanging on the telephone: Make sure lines wrap properly and remove trailing blank lines.

Poul-Henning Kamp phk at FreeBSD.org
Thu Mar 13 10:24:22 CET 2014


commit 6df57da0060f74902f8c8613bb18f664eaa6cc6c
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Jan 28 19:10:45 2014 +0000

    Things you can do while hanging on the telephone:  Make sure lines
    wrap properly and remove trailing blank lines.

diff --git a/Makefile.inc.phk b/Makefile.inc.phk
index 5c25d59..216dcad 100644
--- a/Makefile.inc.phk
+++ b/Makefile.inc.phk
@@ -7,7 +7,8 @@ WARNS	?=	1
 .PHONY: depend all clean install test
 depend all clean install test:
 	@$(MAKE) --no-print-directory -f Makefile.phk TGT=$@ real-$@ \
-	    $(shell env CC=$(CC) WARNS=$(WARNS) sh ${TOPDIR}/config.phk $(TOPDIR) $(CURDIR) )
+	    $(shell env CC=$(CC) WARNS=$(WARNS) \
+	    sh ${TOPDIR}/config.phk $(TOPDIR) $(CURDIR) )
 
 CFLAGS += $(CF_CFLAGS) $(CF_CWFLAGS)
 CFLAGS += -I$(CURDIR)
@@ -241,4 +242,3 @@ real-test: $(TODO_TEST)
 	@true
 
 #######################################################################
-
diff --git a/Makefile.phk b/Makefile.phk
index 237992c..01d3e8c 100644
--- a/Makefile.phk
+++ b/Makefile.phk
@@ -12,4 +12,3 @@ top_install:
 	@for d in man doc etc bin lib libexec ; do \
 		mkdir -p $(INSTALL_BASE)/$$d ; \
 	done
-	
diff --git a/autogen.des b/autogen.des
index d546bc7..a385c71 100755
--- a/autogen.des
+++ b/autogen.des
@@ -18,6 +18,7 @@ rm -f configure
 # autoconf prior to 2.62 has issues with zsh 4.2 and newer
 export CONFIG_SHELL=/bin/sh
 
+env MAKE=gmake \
 ./configure \
     --enable-developer-warnings \
     --enable-debugging-symbols \
diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 24c6eab..5e0dcd2 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -257,7 +257,8 @@ enum vfp_status {
 	VFP_OK = 0,
 	VFP_END = 1,
 };
-typedef enum vfp_status vfp_pull_f(struct busyobj *bo, void *p, ssize_t *len, intptr_t *priv);
+typedef enum vfp_status
+    vfp_pull_f(struct busyobj *bo, void *p, ssize_t *len, intptr_t *priv);
 
 extern vfp_pull_f vfp_gunzip_pull;
 extern vfp_pull_f vfp_gzip_pull;
diff --git a/bin/varnishd/cache/cache_backend_cfg.c b/bin/varnishd/cache/cache_backend_cfg.c
index e5f3198..5a43c2e 100644
--- a/bin/varnishd/cache/cache_backend_cfg.c
+++ b/bin/varnishd/cache/cache_backend_cfg.c
@@ -455,9 +455,11 @@ cli_backend_set_health(struct cli *cli, const char * const *av, void *priv)
 
 static struct cli_proto backend_cmds[] = {
 	{ "backend.list", "backend.list",
-	    "\tList all backends\n", 0, 1, "", cli_backend_list },
+	    "\tList all backends\n",
+	    0, 1, "", cli_backend_list },
 	{ "backend.set_health", "backend.set_health matcher state",
-	    "\tSet health status on a backend\n", 2, 2, "", cli_backend_set_health },
+	    "\tSet health status on a backend\n",
+	    2, 2, "", cli_backend_set_health },
 	{ NULL }
 };
 
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index ebbff7e..9bbc6c1 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -551,7 +551,8 @@ vbf_stp_fetch(struct worker *wrk, struct busyobj *bo)
 	if (bo->state != BOS_FAILED)
 		VBO_setstate(bo, BOS_FINISHED);
 
-VSLb(bo->vsl, SLT_Debug, "YYY REF %d %d", bo->refcount, bo->fetch_obj->objcore->refcnt);
+VSLb(bo->vsl, SLT_Debug, "YYY REF %d %d",
+    bo->refcount, bo->fetch_obj->objcore->refcnt);
 	return (F_STP_DONE);
 }
 
diff --git a/bin/varnishd/cache/cache_http1_fetch.c b/bin/varnishd/cache/cache_http1_fetch.c
index 89e858b..e25ced9 100644
--- a/bin/varnishd/cache/cache_http1_fetch.c
+++ b/bin/varnishd/cache/cache_http1_fetch.c
@@ -389,4 +389,3 @@ V1F_fetch_hdr(struct worker *wrk, struct busyobj *bo, struct req *req)
 	}
 	return (0);
 }
-
diff --git a/bin/varnishd/cache/cache_http1_proto.c b/bin/varnishd/cache/cache_http1_proto.c
index 12a4ba6..8d61a64 100644
--- a/bin/varnishd/cache/cache_http1_proto.c
+++ b/bin/varnishd/cache/cache_http1_proto.c
@@ -539,4 +539,3 @@ HTTP1_Write(const struct worker *w, const struct http *hp, int resp)
 	l += WRW_Write(w, "\r\n", -1);
 	return (l);
 }
-
diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index 49c6712..3cfb36f 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -112,8 +112,10 @@ pan_ws(const struct ws *ws, int indent)
 	if (VALID_OBJ(ws, WS_MAGIC)) {
 		if (WS_Overflowed(ws))
 			VSB_printf(pan_vsp, " OVERFLOW");
-		VSB_printf(pan_vsp, "\n%*sid = \"%s\",\n", indent + 2, "", ws->id);
-		VSB_printf(pan_vsp, "%*s{s,f,r,e} = {%p", indent + 2, "", ws->s);
+		VSB_printf(pan_vsp,
+		    "\n%*sid = \"%s\",\n", indent + 2, "", ws->id);
+		VSB_printf(pan_vsp,
+		    "%*s{s,f,r,e} = {%p", indent + 2, "", ws->s);
 		if (ws->f > ws->s)
 			VSB_printf(pan_vsp, ",+%ld", (long) (ws->f - ws->s));
 		else
diff --git a/bin/varnishd/hash/hash_slinger.h b/bin/varnishd/hash/hash_slinger.h
index a14e6b2..f38c84d 100644
--- a/bin/varnishd/hash/hash_slinger.h
+++ b/bin/varnishd/hash/hash_slinger.h
@@ -65,7 +65,6 @@ enum lookup_e {
 void HSH_Cleanup(struct worker *w);
 enum lookup_e HSH_Lookup(struct req *, struct objcore **, struct objcore **,
     int wait_for_busy, int always_insert);
-// struct objcore *HSH_Lookup(struct req *, int wait_for_busy, int always_insert);
 void HSH_Ref(struct objcore *o);
 void HSH_Drop(struct worker *, struct object **);
 void HSH_Init(const struct hash_slinger *slinger);
diff --git a/bin/varnishd/mgt/mgt_param.c b/bin/varnishd/mgt/mgt_param.c
index 621129d..b5aec87 100644
--- a/bin/varnishd/mgt/mgt_param.c
+++ b/bin/varnishd/mgt/mgt_param.c
@@ -57,31 +57,38 @@ static const int tab0 = 3;
 /*--------------------------------------------------------------------*/
 
 static const char OBJ_STICKY_TEXT[] =
-	"\n\nNB: This parameter is evaluated only when objects are created."
+	"\n\n"
+	"NB: This parameter is evaluated only when objects are created."
 	"To change it for all objects, restart or ban everything.";
 
 static const char DELAYED_EFFECT_TEXT[] =
-	"\n\nNB: This parameter may take quite some time to take (full) effect.";
+	"\n\n"
+	"NB: This parameter may take quite some time to take (full) effect.";
 
 static const char MUST_RESTART_TEXT[] =
-	"\n\nNB: This parameter will not take any effect until the "
+	"\n\n"
+	"NB: This parameter will not take any effect until the "
 	"child process has been restarted.";
 
 static const char MUST_RELOAD_TEXT[] =
-	"\n\nNB: This parameter will not take any effect until the "
+	"\n\n"
+	"NB: This parameter will not take any effect until the "
 	"VCL programs have been reloaded.";
 
 static const char EXPERIMENTAL_TEXT[] =
-	"\n\nNB: We do not know yet if it is a good idea to change "
+	"\n\n"
+	"NB: We do not know yet if it is a good idea to change "
 	"this parameter, or if the default value is even sensible.  "
 	"Caution is advised, and feedback is most welcome.";
 
 static const char WIZARD_TEXT[] =
-	"\n\nNB: Do not change this parameter, unless a developer tell "
+	"\n\n"
+	"NB: Do not change this parameter, unless a developer tell "
 	"you to do so.";
 
 static const char PROTECTED_TEXT[] =
-	"\n\nNB: This parameter is protected and can not be changed.";
+	"\n\n"
+	"NB: This parameter is protected and can not be changed.";
 
 
 /*--------------------------------------------------------------------*/
diff --git a/bin/varnishd/mgt/mgt_sandbox_solaris.c b/bin/varnishd/mgt/mgt_sandbox_solaris.c
index c3dc8a5..255b99c 100644
--- a/bin/varnishd/mgt/mgt_sandbox_solaris.c
+++ b/bin/varnishd/mgt/mgt_sandbox_solaris.c
@@ -388,7 +388,10 @@ mgt_sandbox_solaris_waive(enum sandbox_e who)
 		return;
 	}
 
-	/* simple scheme: (inheritable subset-of effective) subset-of permitted */
+	/*
+	 * simple scheme:
+	 *     (inheritable subset-of effective) subset-of permitted
+	 */
 
 	priv_emptyset(inheritable);
 	mgt_sandbox_solaris_add_inheritable(inheritable, who);
diff --git a/bin/varnishd/storage/stevedore_utils.c b/bin/varnishd/storage/stevedore_utils.c
index 92f531b..081b93a 100644
--- a/bin/varnishd/storage/stevedore_utils.c
+++ b/bin/varnishd/storage/stevedore_utils.c
@@ -205,7 +205,7 @@ STV_FileSize(int fd, const char *size, unsigned *granularity, const char *ctx)
 
 		if (l < 1024*1024)
 			ARGV_ERR("(%s) size \"%s\": too small, "
-				 "did you forget to specify M or G?\n", ctx, size);
+			    "did you forget to specify M or G?\n", ctx, size);
 	}
 
 	/*
diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
index d00ec7c..99c54fa 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -630,7 +630,8 @@ varnish_cli(struct varnish *v, const char *cli, unsigned exp)
  */
 
 static void
-varnish_vcl(struct varnish *v, const char *vcl, enum VCLI_status_e expect, char **resp)
+varnish_vcl(struct varnish *v, const char *vcl, enum VCLI_status_e expect,
+    char **resp)
 {
 	struct vsb *vsb;
 	enum VCLI_status_e u;
diff --git a/config.phk b/config.phk
index aa6856f..16c3571 100644
--- a/config.phk
+++ b/config.phk
@@ -210,7 +210,8 @@ ask_compiler CF_CFLAGS '
 		"-D_GNU_SOURCE=1"
 	#endif
 
-	"-DVCC_CC=~\~exec $(CC) -D_THREAD_SAFE -std=gnu99 -g -O2 -Wall -Werror -pthread -fpic -shared -Wl,-x -o %o %s\~~"
+	"-DVCC_CC=~\~exec $(CC) -D_THREAD_SAFE -std=gnu99 -g " \
+	"-O2 -Wall -Werror -pthread -fpic -shared -Wl,-x -o %o %s\~~"
 
 	"-DVCC_WARNS=~\~$(CF_CWFLAGS)\~~"
 
@@ -295,4 +296,3 @@ exit 0
 # _FILE_OFFSET_BITS -
 # 
 # #echo 'CF_CFLAGS="-Wall"'
-
diff --git a/include/tbl/vsl_tags.h b/include/tbl/vsl_tags.h
index 0f4829b..5dee431 100644
--- a/include/tbl/vsl_tags.h
+++ b/include/tbl/vsl_tags.h
@@ -42,7 +42,8 @@
  *	Long Description (in RST "definition list" format)
  */
 
-#define NODEF_NOTICE "Note: This log record is masked by default and must be explicitly enabled\n\n"
+#define NODEF_NOTICE \
+    "NB: This log record is masked by default.\n\n"
 
 SLTM(Debug, SLT_F_BINARY, "Debug messages",
 	"Debug messages can normally be ignored, but are sometimes"
@@ -206,8 +207,8 @@ SLTM(FetchError, 0, "Error while fetching object",
 #undef SLTH
 
 #define SLTH(tag, ind, req, resp, sdesc, ldesc) \
-	SLTM(Beresp##tag, (resp ? 0 : SLT_F_UNUSED), "Backend response " sdesc, \
-	    ldesc)
+	SLTM(Beresp##tag, (resp ? 0 : SLT_F_UNUSED), "Backend response " \
+	    sdesc, ldesc)
 #include "tbl/vsl_tags_http.h"
 #undef SLTH
 
diff --git a/include/vapi/vsc.h b/include/vapi/vsc.h
index d0904eb..88be5d9 100644
--- a/include/vapi/vsc.h
+++ b/include/vapi/vsc.h
@@ -59,8 +59,10 @@ int VSC_Arg(struct VSM_data *vd, int arg, const char *opt);
 	 *	 1 Handled.
 	 */
 
-struct VSC_C_mgt *VSC_Mgt(const struct VSM_data *vd, struct VSM_fantom *fantom);
-struct VSC_C_main *VSC_Main(const struct VSM_data *vd, struct VSM_fantom *fantom);
+struct VSC_C_mgt *VSC_Mgt(const struct VSM_data *vd,
+    struct VSM_fantom *fantom);
+struct VSC_C_main *VSC_Main(const struct VSM_data *vd,
+    struct VSM_fantom *fantom);
 	/*
 	 * Looks up and returns the management stats and the child main
 	 * stats structure. If fantom is non-NULL, it can later be used
@@ -80,8 +82,8 @@ struct VSC_C_main *VSC_Main(const struct VSM_data *vd, struct VSM_fantom *fantom
 	 *  non-NULL: Success
 	 */
 
-void *VSC_Get(const struct VSM_data *vd, struct VSM_fantom *fantom, const char *type,
-    const char *ident);
+void *VSC_Get(const struct VSM_data *vd, struct VSM_fantom *fantom,
+    const char *type, const char *ident);
 	/*
 	 * Looks up the given VSC type and identifier. If fantom is
 	 * non-NULL, it can if successful later be used with
diff --git a/include/vrnd.h b/include/vrnd.h
index ac46c0d..7cfab1d 100644
--- a/include/vrnd.h
+++ b/include/vrnd.h
@@ -29,4 +29,3 @@
  */
 
 void VRND_Seed(void);		/* Seed random(3) properly */
-
diff --git a/include/vrt.h b/include/vrt.h
index 3d465c6..9b3664a 100644
--- a/include/vrt.h
+++ b/include/vrt.h
@@ -209,7 +209,8 @@ void VRT_error(const struct vrt_ctx *, unsigned, const char *);
 int VRT_switch_config(const char *);
 
 char *VRT_GetHdr(const struct vrt_ctx *, const struct gethdr_s *);
-void VRT_SetHdr(const struct vrt_ctx *, const struct gethdr_s *, const char *, ...);
+void VRT_SetHdr(const struct vrt_ctx *, const struct gethdr_s *,
+    const char *, ...);
 void VRT_handling(const struct vrt_ctx *, unsigned hand);
 
 void VRT_hashdata(const struct vrt_ctx *, const char *str, ...);
diff --git a/lib/libvarnish/Makefile.phk b/lib/libvarnish/Makefile.phk
index 677e687..2a0c37a 100644
--- a/lib/libvarnish/Makefile.phk
+++ b/lib/libvarnish/Makefile.phk
@@ -27,4 +27,3 @@ LIB_SRC += vtim.c
 
 TOPDIR= $(CURDIR)/../..
 include $(TOPDIR)/Makefile.inc.phk
-
diff --git a/lib/libvarnishapi/Makefile.phk b/lib/libvarnishapi/Makefile.phk
index 8e86df4..2c3e907 100644
--- a/lib/libvarnishapi/Makefile.phk
+++ b/lib/libvarnishapi/Makefile.phk
@@ -33,5 +33,3 @@ include $(TOPDIR)/Makefile.inc.phk
 
 $(MADE_FILES):  generate.py
 	python generate.py
-
-
diff --git a/lib/libvarnishapi/vsl.c b/lib/libvarnishapi/vsl.c
index b9455db..363085a 100644
--- a/lib/libvarnishapi/vsl.c
+++ b/lib/libvarnishapi/vsl.c
@@ -163,7 +163,8 @@ VSL_ResetError(struct VSL_data *vsl)
 }
 
 static int
-vsl_match_IX(struct VSL_data *vsl, const vslf_list *list, const struct VSL_cursor *c)
+vsl_match_IX(struct VSL_data *vsl, const vslf_list *list,
+    const struct VSL_cursor *c)
 {
 	enum VSL_tag_e tag;
 	const char *cdata;
diff --git a/lib/libvarnishcompat/execinfo.c b/lib/libvarnishcompat/execinfo.c
index 7babdd4..a9b4471 100644
--- a/lib/libvarnishcompat/execinfo.c
+++ b/lib/libvarnishcompat/execinfo.c
@@ -140,7 +140,7 @@ getreturnaddr(int level)
 {
 
 	switch(level) {
-#define DO_P2_TIMES_0(x)	case (x): return __builtin_return_address((x) + 1)
+#define DO_P2_TIMES_0(x)  case (x): return __builtin_return_address((x) + 1)
 	DO_P2_TIMES_7(0);
 #undef DO_P2_TIMES_0
 	default: return NULL;
@@ -152,7 +152,7 @@ getframeaddr(int level)
 {
 
 	switch(level) {
-#define DO_P2_TIMES_0(x)	case (x): return __builtin_frame_address((x) + 1)
+#define DO_P2_TIMES_0(x)  case (x): return __builtin_frame_address((x) + 1)
 	DO_P2_TIMES_7(0);
 #undef DO_P2_TIMES_0
 	default: return NULL;
diff --git a/lib/libvarnishtools/Makefile.phk b/lib/libvarnishtools/Makefile.phk
index 366a04d..0781a45 100644
--- a/lib/libvarnishtools/Makefile.phk
+++ b/lib/libvarnishtools/Makefile.phk
@@ -4,4 +4,3 @@ LIB_SRC += vut.c
 
 TOPDIR= $(CURDIR)/../..
 include $(TOPDIR)/Makefile.inc.phk
-
diff --git a/lib/libvcc/Makefile.phk b/lib/libvcc/Makefile.phk
index 131f850..333bad4 100644
--- a/lib/libvcc/Makefile.phk
+++ b/lib/libvcc/Makefile.phk
@@ -23,4 +23,3 @@ include $(TOPDIR)/Makefile.inc.phk
 
 $(MADE_FILES):	generate.py
 	$(PYTHON) generate.py
-
diff --git a/lib/libvcc/generate.py b/lib/libvcc/generate.py
index dbffe99..a36c2d4 100755
--- a/lib/libvcc/generate.py
+++ b/lib/libvcc/generate.py
@@ -78,19 +78,58 @@ tokens = {
 # Our methods and actions
 
 returns =(
-	('recv',		"C", ('error', 'pass', 'pipe', 'hash', 'purge',)),
-	('pipe',		"C", ('error', 'pipe',)),
-	('pass',		"C", ('error', 'restart', 'fetch',)),
-	('hash',		"C", ('lookup',)),
-	('purge',		"C", ('error', 'fetch',)),
-	('miss',		"C", ('error', 'restart', 'pass', 'fetch',)),
-	('hit',			"C", ('error', 'restart', 'pass', 'fetch', 'deliver',)),
-	('backend_fetch',	"B", ('fetch', 'abandon')),
-	('backend_response',	"B", ('deliver', 'retry', 'abandon')),
-	('deliver',		"C", ('restart', 'deliver',)),
-	('error',		"C", ('restart', 'deliver',)),
-	('init',		"", ('ok',)),
-	('fini',		"", ('ok',)),
+	('recv',
+		"C",
+		('error', 'pass', 'pipe', 'hash', 'purge',)
+	),
+	('pipe',
+		"C",
+		('error', 'pipe',)
+	),
+	('pass',
+		"C",
+		('error', 'restart', 'fetch',)
+	),
+	('hash',
+		"C",
+		('lookup',)
+	),
+	('purge',
+		"C",
+		('error', 'fetch',)
+	),
+	('miss',
+		"C",
+		('error', 'restart', 'pass', 'fetch',)
+	),
+	('hit',
+		"C",
+		('error', 'restart', 'pass', 'fetch', 'deliver',)
+	),
+	('backend_fetch',
+		"B",
+		('fetch', 'abandon')
+	),
+	('backend_response',
+		"B",
+		('deliver', 'retry', 'abandon')
+	),
+	('deliver',
+		"C",
+		('restart', 'deliver',)
+	),
+	('error',
+		"C",
+		('restart', 'deliver',)
+	),
+	('init',
+		"",
+		('ok',)
+	),
+	('fini',
+		"",
+		('ok',)
+	),
 )
 
 #######################################################################
diff --git a/lib/libvcc/vcc_acl.c b/lib/libvcc/vcc_acl.c
index 6f473e9..1ab670a 100644
--- a/lib/libvcc/vcc_acl.c
+++ b/lib/libvcc/vcc_acl.c
@@ -352,7 +352,8 @@ vcc_acl_emit(const struct vcc *tl, const char *acln, int anon)
 	struct token *t;
 
 	Fh(tl, 0, "\nstatic int\n");
-	Fh(tl, 0, "match_acl_%s_%s(const struct vrt_ctx *ctx, const VCL_IP p)\n",
+	Fh(tl, 0,
+	    "match_acl_%s_%s(const struct vrt_ctx *ctx, const VCL_IP p)\n",
 	    anon ? "anon" : "named", acln);
 	Fh(tl, 0, "{\n");
 	Fh(tl, 0, "\tconst unsigned char *a;\n");
diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index 5b8672a..959f203 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -131,8 +131,6 @@ class vmod(object):
 			fo.write("int " + self.init)
 			fo.write(
 			    "(struct vmod_priv *, const struct VCL_conf *);\n")
-		#fo.write("\n")
-		#fo.write("extern const void * const Vmod_" + self.nam + "_Id;\n")
 
 	def c_typedefs_(self):
 		l = list()
diff --git a/lib/libvmod_debug/Makefile.phk b/lib/libvmod_debug/Makefile.phk
index 98e52e7..a692640 100644
--- a/lib/libvmod_debug/Makefile.phk
+++ b/lib/libvmod_debug/Makefile.phk
@@ -4,4 +4,3 @@ VMOD_SRC += vmod_debug_obj.c
 
 TOPDIR= $(CURDIR)/../..
 include $(TOPDIR)/Makefile.inc.phk
-
diff --git a/lib/libvmod_debug/vmod.vcc b/lib/libvmod_debug/vmod.vcc
index 8d2919e..4f74a24 100644
--- a/lib/libvmod_debug/vmod.vcc
+++ b/lib/libvmod_debug/vmod.vcc
@@ -78,4 +78,3 @@ Foo indeed.
 $Method TIME .date()
 
 You never know when you need a date.
-
diff --git a/lib/libvmod_debug/vmod_debug.c b/lib/libvmod_debug/vmod_debug.c
index 46811d6..7109644 100644
--- a/lib/libvmod_debug/vmod_debug.c
+++ b/lib/libvmod_debug/vmod_debug.c
@@ -129,4 +129,3 @@ vmod_blob2hex(const struct vrt_ctx *ctx, VCL_BLOB b)
 	vmod_priv_fini(b);
 	return (s);
 }
-
diff --git a/lib/libvmod_directors/Makefile.phk b/lib/libvmod_directors/Makefile.phk
index 424a275..bf0a921 100644
--- a/lib/libvmod_directors/Makefile.phk
+++ b/lib/libvmod_directors/Makefile.phk
@@ -7,4 +7,3 @@ VMOD_SRC += vdir.c
 
 TOPDIR= $(CURDIR)/../..
 include $(TOPDIR)/Makefile.inc.phk
-
diff --git a/lib/libvmod_directors/vdir.c b/lib/libvmod_directors/vdir.c
index dacd648..c8a8c84 100644
--- a/lib/libvmod_directors/vdir.c
+++ b/lib/libvmod_directors/vdir.c
@@ -204,4 +204,3 @@ vdir_pick_be(struct vdir *vd, double w, unsigned nloops)
 	vdir_unlock(vd);
 	return (be);
 }
-
diff --git a/lib/libvmod_std/Makefile.phk b/lib/libvmod_std/Makefile.phk
index ca093a0..1b3e34b 100644
--- a/lib/libvmod_std/Makefile.phk
+++ b/lib/libvmod_std/Makefile.phk
@@ -5,4 +5,3 @@ VMOD_SRC += vmod_std_fileread.c
 
 TOPDIR= $(CURDIR)/../..
 include $(TOPDIR)/Makefile.inc.phk
-
diff --git a/lib/libvmod_std/vmod_std_fileread.c b/lib/libvmod_std/vmod_std_fileread.c
index 5ddc6bf..4fce9a2 100644
--- a/lib/libvmod_std/vmod_std_fileread.c
+++ b/lib/libvmod_std/vmod_std_fileread.c
@@ -83,7 +83,8 @@ free_frfile(void *ptr)
 }
 
 VCL_STRING __match_proto__(td_std_fileread)
-vmod_fileread(const struct vrt_ctx *ctx, struct vmod_priv *priv, VCL_STRING file_name)
+vmod_fileread(const struct vrt_ctx *ctx, struct vmod_priv *priv,
+    VCL_STRING file_name)
 {
 	struct frfile *frf = NULL;
 	char *s;



More information about the varnish-commit mailing list