[master] 688a837 Revert "Kill one indentation"

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Fri Mar 18 12:24:04 CET 2016


commit 688a8376ed63e6dcf60521c0393904a18e6e464e
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Fri Mar 18 12:14:54 2016 +0100

    Revert "Kill one indentation"
    
    This reverts commit eaac258d557132f3dfe496425b05dc821de32ab9.
    
    The benefits in terms of readability are uncertain and YMMV, but
    compilers seem to find it harder to optimize too:
    
       cmpl   $0x0,-0x205c(%rbp)
       sete   %al
       movzbl %al,%eax
       or     %rax,%rdx
    
    Before the change it would translate to just:
    
       or     $0x1,%rax
       mov    %rax,%rdx
    
    Spotted by @fgsch

diff --git a/bin/varnishd/cache/cache_backend_probe.c b/bin/varnishd/cache/cache_backend_probe.c
index d1608db..ea63abe 100644
--- a/bin/varnishd/cache/cache_backend_probe.c
+++ b/bin/varnishd/cache/cache_backend_probe.c
@@ -271,7 +271,8 @@ vbp_poke(struct vbp_target *vt)
 		if (tmo > 0)
 			i = poll(pfd, 1, tmo);
 		if (i == 0 || tmo <= 0) {
-			vt->err_recv |= (i == 0);
+			if (i == 0)
+				vt->err_recv |= 1;
 			VTCP_close(&s);
 			return;
 		}



More information about the varnish-commit mailing list