[master] 798ebde Printf format fixes for osx-i386

Poul-Henning Kamp phk at FreeBSD.org
Wed Feb 25 10:10:59 CET 2015


commit 798ebde4ba67b7c569ba0e8b47ef746fc0338529
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Feb 25 09:10:35 2015 +0000

    Printf format fixes for osx-i386

diff --git a/bin/varnishd/waiter/cache_waiter_kqueue.c b/bin/varnishd/waiter/cache_waiter_kqueue.c
index dfc8596..52633e2 100644
--- a/bin/varnishd/waiter/cache_waiter_kqueue.c
+++ b/bin/varnishd/waiter/cache_waiter_kqueue.c
@@ -123,8 +123,6 @@ vwk_sess_ev(const struct vwk *vwk, const struct kevent *kp, double now)
 
 	idle = now - *vwk->waiter->tmo;
 
-	VSL(SLT_Debug, 0, "KQR d %ju filter %d data %jd flags 0x%x idle %g",
-	    kp->ident, kp->filter, kp->data, kp->flags, sp->idle - idle);
 	if (sp->idle <= idle) {
 		Wait_Handle(vwk->waiter, sp, WAITER_TIMEOUT, now);
 	} else if (kp->flags & EV_EOF) {
@@ -133,8 +131,8 @@ vwk_sess_ev(const struct vwk *vwk, const struct kevent *kp, double now)
 		if (kp->data == 0)
 			VSL(SLT_Debug, 0,
 			    "KQR d %ju filter %d data %jd flags 0x%x idle %g",
-			    kp->ident, kp->filter, kp->data, kp->flags,
-			    sp->idle - idle);
+			    (uintmax_t)kp->ident, kp->filter,
+			    (intmax_t)kp->data, kp->flags, sp->idle - idle);
 		Wait_Handle(vwk->waiter, sp, WAITER_ACTION, now);
 	}
 }



More information about the varnish-commit mailing list