r5574 - in trunk/varnish-cache: bin/varnishd include lib/libvarnish

[phk at varnish-cache.org]

Author: phk
Date: 2010-11-21 11:24:34 +0100 (Sun, 21 Nov 2010)
New Revision: 5574

Modified:
   trunk/varnish-cache/bin/varnishd/cache_backend.c
   trunk/varnish-cache/bin/varnishd/cache_hash.c
   trunk/varnish-cache/bin/varnishd/stevedore.c
   trunk/varnish-cache/bin/varnishd/storage_persistent.c
   trunk/varnish-cache/include/http_headers.h
   trunk/varnish-cache/lib/libvarnish/vss.c
Log:
White space fixes



Modified: trunk/varnish-cache/bin/varnishd/cache_backend.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_backend.c	2010-11-21 10:22:19 UTC (rev 5573)
+++ trunk/varnish-cache/bin/varnishd/cache_backend.c	2010-11-21 10:24:34 UTC (rev 5574)
@@ -303,7 +303,7 @@
 	if (threshold == 0)
 		return (1);
 
-	if (sp->objcore == NULL) 
+	if (sp->objcore == NULL)
 		return (1);
 
 	now = sp->t_req;

Modified: trunk/varnish-cache/bin/varnishd/cache_hash.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_hash.c	2010-11-21 10:22:19 UTC (rev 5573)
+++ trunk/varnish-cache/bin/varnishd/cache_hash.c	2010-11-21 10:24:34 UTC (rev 5574)
@@ -679,7 +679,7 @@
 		w->stats.n_object--;
 	}
 
-	if (oc == NULL) 
+	if (oc == NULL)
 		return (0);
 
 	AN(oh);

Modified: trunk/varnish-cache/bin/varnishd/stevedore.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/stevedore.c	2010-11-21 10:22:19 UTC (rev 5573)
+++ trunk/varnish-cache/bin/varnishd/stevedore.c	2010-11-21 10:24:34 UTC (rev 5574)
@@ -151,10 +151,10 @@
 struct stv_objsecrets {
 	unsigned	magic;
 #define STV_OBJ_SECRETES_MAGIC	0x78c87247
-	unsigned 	nhttp;
-	unsigned 	lhttp;
+	unsigned	nhttp;
+	unsigned	lhttp;
 	unsigned	wsl;
-	double 		ttl;
+	double		ttl;
 };
 
 /*********************************************************************
@@ -177,7 +177,7 @@
 	assert(PAOK(ptr));
 	assert(ltot >= sizeof *o + soc->lhttp + soc->wsl);
 
-	o = ptr; 
+	o = ptr;
 	memset(o, 0, sizeof *o);
 	o->magic = OBJECT_MAGIC;
 

Modified: trunk/varnish-cache/bin/varnishd/storage_persistent.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/storage_persistent.c	2010-11-21 10:22:19 UTC (rev 5573)
+++ trunk/varnish-cache/bin/varnishd/storage_persistent.c	2010-11-21 10:24:34 UTC (rev 5574)
@@ -702,7 +702,7 @@
 	CHECK_OBJ_NOTNULL(oc, OBJCORE_MAGIC);
 	o = smp_oc_getobj(NULL, oc);
 	AN(o);
-	
+
 	CAST_OBJ_NOTNULL(sg, oc->priv, SMP_SEG_MAGIC);
 	CHECK_OBJ_NOTNULL(sg->sc, SMP_SC_MAGIC);
 	smp_index = oc->priv2;
@@ -1439,7 +1439,7 @@
 	o = STV_MkObject(sp, st->ptr, ltot, soc);
 	CHECK_OBJ_NOTNULL(o, OBJECT_MAGIC);
 	o->objstore = st;
-	
+
 	oc = o->objcore;
 	CHECK_OBJ_NOTNULL(oc, OBJCORE_MAGIC);
 	oc->flags |= OC_F_LRUDONTMOVE;

Modified: trunk/varnish-cache/include/http_headers.h
===================================================================
--- trunk/varnish-cache/include/http_headers.h	2010-11-21 10:22:19 UTC (rev 5573)
+++ trunk/varnish-cache/include/http_headers.h	2010-11-21 10:24:34 UTC (rev 5574)
@@ -62,7 +62,7 @@
 HTTPH("Age",			H_Age,			2, 0,						    HTTPH_A_INS,			0, 0)	/* RFC2616 14.6 */
 HTTPH("Allow",			H_Allow,		2, 0, 0,										0, 0)	/* RFC2616 14.7 */
 HTTPH("Authorization",		H_Authorization,	1, 0, 0,										0, 0)	/* RFC2616 14.8 */
-HTTPH("Cache-Control",		H_Cache_Control,	3, 3,               		    HTTPH_R_FETCH,					0, 0)	/* RFC2616 14.9 */
+HTTPH("Cache-Control",		H_Cache_Control,	3, 3,				    HTTPH_R_FETCH,					0, 0)	/* RFC2616 14.9 */
 HTTPH("Connection",		H_Connection,		3, 3, HTTPH_R_PASS | HTTPH_A_PASS | HTTPH_R_FETCH | HTTPH_A_INS,			0, 0)	/* RFC2616 14.10 */
 HTTPH("Content-Encoding",	H_Content_Encoding,	2, 0, 0,										0, 0)	/* RFC2616 14.11 */
 HTTPH("Content-Langugae",	H_Content_Language,	2, 0, 0,										0, 0)	/* RFC2616 14.12 */

Modified: trunk/varnish-cache/lib/libvarnish/vss.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/vss.c	2010-11-21 10:22:19 UTC (rev 5573)
+++ trunk/varnish-cache/lib/libvarnish/vss.c	2010-11-21 10:24:34 UTC (rev 5574)
@@ -290,10 +290,12 @@
 	struct vss_addr **vaddr;
 	struct pollfd pfd;
 
+#if 0
 	retval = VSS_parse(str, &addr, &port);
 	if (retval < 0)
 		return (retval);
-	nvaddr = VSS_resolve(addr, port, &vaddr);
+#endif
+	nvaddr = VSS_resolve(str, NULL, &vaddr);
 	if (nvaddr <= 0) {
 		free(addr);
 		free(port);