r3618 - in branches/2.0/varnish-cache/lib: libvarnish libvcl

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-02-05 12:51:20 +0100 (Thu, 05 Feb 2009)
New Revision: 3618

Modified:
   branches/2.0/varnish-cache/lib/libvarnish/vss.c
   branches/2.0/varnish-cache/lib/libvcl/vcc_parse.c
   branches/2.0/varnish-cache/lib/libvcl/vcc_xref.c
Log:
Merge r3410: Various nits.



Modified: branches/2.0/varnish-cache/lib/libvarnish/vss.c
===================================================================
--- branches/2.0/varnish-cache/lib/libvarnish/vss.c	2009-02-05 11:47:18 UTC (rev 3617)
+++ branches/2.0/varnish-cache/lib/libvarnish/vss.c	2009-02-05 11:51:20 UTC (rev 3618)
@@ -155,7 +155,7 @@
 	XXXAN(va);
 	*vap = va;
 	for (res = res0, i = 0; res != NULL; res = res->ai_next, ++i) {
-		va[i] = calloc(1, sizeof *va[i]);
+		va[i] = calloc(1, sizeof(*va[i]));
 		XXXAN(va[i]);
 		va[i]->va_family = res->ai_family;
 		va[i]->va_socktype = res->ai_socktype;

Modified: branches/2.0/varnish-cache/lib/libvcl/vcc_parse.c
===================================================================
--- branches/2.0/varnish-cache/lib/libvcl/vcc_parse.c	2009-02-05 11:47:18 UTC (rev 3617)
+++ branches/2.0/varnish-cache/lib/libvcl/vcc_parse.c	2009-02-05 11:51:20 UTC (rev 3618)
@@ -127,7 +127,7 @@
 static double
 RateUnit(struct tokenlist *tl)
 {
-	double sc = 1.0;
+	double sc;
 
 	assert(tl->t->tok == ID);
 	sc = SizeUnit(tl);

Modified: branches/2.0/varnish-cache/lib/libvcl/vcc_xref.c
===================================================================
--- branches/2.0/varnish-cache/lib/libvcl/vcc_xref.c	2009-02-05 11:47:18 UTC (rev 3617)
+++ branches/2.0/varnish-cache/lib/libvcl/vcc_xref.c	2009-02-05 11:51:20 UTC (rev 3618)
@@ -28,7 +28,7 @@
  *
  * $Id$
  *
- * This fine contains code for two cross-reference or consistency checks.
+ * This file contains code for two cross-reference or consistency checks.
  *
  * The first check is simply that all functions, acls and backends are
  * both defined and referenced.  Complaints about referenced but undefined
@@ -90,7 +90,7 @@
 		vcc_ErrToken(tl, r->name);
 		vsb_printf(tl->sb, " has unknown type %d\n",
 		    r->type);
-		return "???";
+		return "?";
 	}
 }