Polish

bin/varnishd/mgt/mgt_sandbox.c

@@ -245,7 +245,7 @@ mgt_sandbox_unix(enum sandbox_e who)
 
 /*--------------------------------------------------------------------*/
 
-static void __match_proto__(sub_func_f)
+static void __match_proto__(vsub_func_f)
 run_sandbox_test(void *priv)
 {
 

bin/varnishd/mgt/mgt_vcc.c

@@ -77,7 +77,7 @@ static const char * const builtin_vcl =
  * Invoke system VCC compiler in a sub-process
  */
 
-static void
+static void __match_proto__(vsub_func_f)
 run_vcc(void *priv)
 {
 	char *csrc;
@@ -122,7 +122,7 @@ run_vcc(void *priv)
  * Invoke system C compiler in a sub-process
  */
 
-static void
+static void __match_proto__(vsub_func_f)
 run_cc(void *priv)
 {
 	struct vcc_priv *vp;
@@ -172,7 +172,7 @@ run_cc(void *priv)
  * Attempt to open compiled VCL in a sub-process
  */
 
-static void __match_proto__(sub_func_f)
+static void __match_proto__(vsub_func_f)
 run_dlopen(void *priv)
 {
 	void *dlh;

bin/varnishtest/tests/b00046.vtc

@@ -5,7 +5,7 @@ server s1 {
 	send_urgent " "
 	txresp
 	send_urgent " "
-	
+
 	rxreq
 	send_urgent " "
 	txresp

lib/libvarnish/vsub.c

@@ -100,13 +100,13 @@ VSUB_run(struct vsb *sb, vsub_func_f *func, void *priv, const char *name,
 		assert(dup2(p[1], STDOUT_FILENO) == STDOUT_FILENO);
 		assert(dup2(p[1], STDERR_FILENO) == STDERR_FILENO);
 		/* Close all other fds */
-		for (sfd = STDERR_FILENO + 1; sfd < 100; sfd++)
+		for (sfd = STDERR_FILENO+1; sfd < sysconf(_SC_OPEN_MAX); sfd++)
 			(void)close(sfd);
 		func(priv);
 		/*
 		 * func should either exec or exit, so getting here should be
 		 * treated like an assertion failure - except that we don't know
-		 * if it's save to trigger an acutal assertion
+		 * if it's safe to trigger an acutal assertion
 		 */
 		_exit(4);
 	}