r4015 - in branches/2.0/varnish-cache: bin/varnishd doc

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-04-01 14:21:48 +0200 (Wed, 01 Apr 2009)
New Revision: 4015

Modified:
   branches/2.0/varnish-cache/bin/varnishd/cache_vrt.c
   branches/2.0/varnish-cache/bin/varnishd/varnishd.c
   branches/2.0/varnish-cache/doc/Makefile.am
Log:
Merge r3952,r3953: Unused variables


Modified: branches/2.0/varnish-cache/bin/varnishd/cache_vrt.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/cache_vrt.c	2009-04-01 11:04:43 UTC (rev 4014)
+++ branches/2.0/varnish-cache/bin/varnishd/cache_vrt.c	2009-04-01 12:21:48 UTC (rev 4015)
@@ -569,6 +569,8 @@
 const char*
 VRT_r_server_identity(struct sess *sp)
 {
+	(void)sp;
+
 	if (heritage.identity[0] != '\0')
 		return heritage.identity;
 	else 
@@ -579,6 +581,8 @@
 const char*
 VRT_r_server_hostname(struct sess *sp)
 {
+	(void)sp;
+
 	if (vrt_hostname[0] == '\0')
 		gethostname(vrt_hostname, 255);
 	

Modified: branches/2.0/varnish-cache/bin/varnishd/varnishd.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/varnishd.c	2009-04-01 11:04:43 UTC (rev 4014)
+++ branches/2.0/varnish-cache/bin/varnishd/varnishd.c	2009-04-01 12:21:48 UTC (rev 4015)
@@ -596,8 +596,8 @@
 
 
 	if (i_arg != NULL) {
-		size_t len;
-		if (snprintf(heritage.identity, sizeof heritage.identity, "%s", i_arg) > sizeof heritage.identity) {
+		if (snprintf(heritage.identity, sizeof heritage.identity,
+		    "%s", i_arg) > sizeof heritage.identity) {
 			fprintf(stderr, "Invalid identity name: %s\n",
 			    strerror(ENAMETOOLONG));
 			exit(1);

Modified: branches/2.0/varnish-cache/doc/Makefile.am
===================================================================
--- branches/2.0/varnish-cache/doc/Makefile.am	2009-04-01 11:04:43 UTC (rev 4014)
+++ branches/2.0/varnish-cache/doc/Makefile.am	2009-04-01 12:21:48 UTC (rev 4015)
@@ -1,6 +1,7 @@
 # $Id$
 
 CHANGELOGS = \
+	changes-2.0.4.html \
 	changes-2.0.3.html \
 	changes-2.0.2.html \
 	changes-2.0.1.html \
@@ -11,6 +12,7 @@
 	changes-1.0.4.html
 
 XML = \
+	changes-2.0.3-2.0.4.xml \
 	changes-2.0.2-2.0.3.xml \
 	changes-2.0.1-2.0.2.xml \
 	changes-2.0-2.0.1.xml \