r3493 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2008-12-21 19:35:47 +0100 (Sun, 21 Dec 2008)
New Revision: 3493

Modified:
   trunk/varnish-cache/bin/varnishd/cache_session.c
Log:
Remove pointless initialization.

Fix indentation.



Modified: trunk/varnish-cache/bin/varnishd/cache_session.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_session.c	2008-12-21 18:35:24 UTC (rev 3492)
+++ trunk/varnish-cache/bin/varnishd/cache_session.c	2008-12-21 18:35:47 UTC (rev 3493)
@@ -382,7 +382,7 @@
 void
 SES_InheritBackendTimeouts(struct sess *sp)
 {
-	struct backend *be = NULL;
+	struct backend *be;
 
 	AN(sp);
 	AN(sp->vbe);
@@ -395,13 +395,12 @@
 	 * is parameter < backend definition < VCL.
 	 */
 	if (be->connect_timeout > 1e-3 && 
-			sp->connect_timeout == params->connect_timeout)
+	    sp->connect_timeout == params->connect_timeout)
 		sp->connect_timeout = be->connect_timeout;
 	if (be->first_byte_timeout > 1e-3 && 
-			sp->first_byte_timeout == params->first_byte_timeout)
+	    sp->first_byte_timeout == params->first_byte_timeout)
 		sp->first_byte_timeout = be->first_byte_timeout;
-	if (be->between_bytes_timeout > 1e-3 
-			&& sp->between_bytes_timeout == params->between_bytes_timeout)
+	if (be->between_bytes_timeout > 1e-3 &&
+	    sp->between_bytes_timeout == params->between_bytes_timeout)
 		sp->between_bytes_timeout = be->between_bytes_timeout;
 }
-