[master] baee057 Consistency

Federico G. Schwindt fgsch at lodoss.net
Mon Feb 13 21:26:05 CET 2017


commit baee05738d042b0a98e02d0d725f43a4a941dfdd
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Feb 13 20:23:04 2017 +0000

    Consistency

diff --git a/bin/varnishncsa/varnishncsa.c b/bin/varnishncsa/varnishncsa.c
index 2e0f14e..bec05e5 100644
--- a/bin/varnishncsa/varnishncsa.c
+++ b/bin/varnishncsa/varnishncsa.c
@@ -1217,10 +1217,10 @@ main(int argc, char * const *argv)
 		openout(CTX.a_opt);
 		AN(CTX.fo);
 		if (VUT.D_opt)
-			VUT.sighup_f = &rotateout;
+			VUT.sighup_f = rotateout;
 	} else
 		CTX.fo = stdout;
-	VUT.idle_f = &flushout;
+	VUT.idle_f = flushout;
 
 	VUT_Setup();
 	VUT_Main();
diff --git a/lib/libvarnishapi/vut.c b/lib/libvarnishapi/vut.c
index 3d724c4..0783f7d 100644
--- a/lib/libvarnishapi/vut.c
+++ b/lib/libvarnishapi/vut.c
@@ -363,7 +363,7 @@ VUT_Main(void)
 		if (VUT.sighup && VUT.sighup_f) {
 			/* sighup callback */
 			VUT.sighup = 0;
-			i = (VUT.sighup_f)();
+			i = VUT.sighup_f();
 			if (i)
 				break;
 		}
@@ -402,7 +402,7 @@ VUT_Main(void)
 		else if (i == 0) {
 			/* Nothing to do but wait */
 			if (VUT.idle_f) {
-				i = (VUT.idle_f)();
+				i = VUT.idle_f();
 				if (i)
 					break;
 			}



More information about the varnish-commit mailing list