[master] 037e9dc Minor nits.

Poul-Henning Kamp phk at varnish-cache.org
Tue Oct 29 13:50:07 CET 2013


commit 037e9dc2666590a7070dd92d1b16d58fed16ac7b
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Oct 29 12:49:59 2013 +0000

    Minor nits.

diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index 915aea6..4006ea3 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -464,7 +464,7 @@ SES_NewPool(struct pool *wp, unsigned pool_no)
 	pp->mpl_req = MPL_New(nb, &cache_param->req_pool,
 	    &cache_param->workspace_client);
 	bprintf(nb, "sess%u", pool_no);
-	ses_size = sizeof (struct sess) + vsa_suckaddr_len * 2;
+	ses_size = sizeof (struct sess) + vsa_suckaddr_len * 2L;
 	pp->mpl_sess = MPL_New(nb, &cache_param->sess_pool, &ses_size);
 	return (pp);
 }
diff --git a/bin/varnishd/mgt/mgt_child.c b/bin/varnishd/mgt/mgt_child.c
index f5ff211..6d58eeb 100644
--- a/bin/varnishd/mgt/mgt_child.c
+++ b/bin/varnishd/mgt/mgt_child.c
@@ -316,7 +316,7 @@ child_poker(const struct vev *e, int what)
  */
 
 static void __match_proto__()
-mgt_sigsegv_handler(int s, siginfo_t *si, void *c)
+child_sigsegv_handler(int s, siginfo_t *si, void *c)
 {
 	char buf[1024];
 
@@ -414,7 +414,7 @@ mgt_launch_child(struct cli *cli)
 
 		if (mgt_param.sigsegv_handler) {
 			memset(&sa, 0, sizeof sa);
-			sa.sa_sigaction = mgt_sigsegv_handler;
+			sa.sa_sigaction = child_sigsegv_handler;
 			sa.sa_flags = SA_SIGINFO;
 			(void)sigaction(SIGSEGV, &sa, NULL);
 		}



More information about the varnish-commit mailing list