r4671 - in branches/2.1: . varnish-cache/bin/varnishadm varnish-cache/bin/varnishd varnish-cache/bin/varnishtest/tests varnish-cache/include varnish-cache/lib/libvarnish varnish-cache/lib/libvcl

[tfheen at varnish-cache.org]

Author: tfheen
Date: 2010-04-19 12:19:46 +0200 (Mon, 19 Apr 2010)
New Revision: 4671

Modified:
   branches/2.1/
   branches/2.1/varnish-cache/bin/varnishadm/varnishadm.c
   branches/2.1/varnish-cache/bin/varnishd/cache_backend.h
   branches/2.1/varnish-cache/bin/varnishd/cache_backend_cfg.c
   branches/2.1/varnish-cache/bin/varnishd/mgt_pool.c
   branches/2.1/varnish-cache/bin/varnishd/vparam.h
   branches/2.1/varnish-cache/bin/varnishtest/tests/c00019.vtc
   branches/2.1/varnish-cache/bin/varnishtest/tests/r00325.vtc
   branches/2.1/varnish-cache/bin/varnishtest/tests/r00416.vtc
   branches/2.1/varnish-cache/bin/varnishtest/tests/v00011.vtc
   branches/2.1/varnish-cache/include/vct.h
   branches/2.1/varnish-cache/include/vev.h
   branches/2.1/varnish-cache/lib/libvarnish/tcp.c
   branches/2.1/varnish-cache/lib/libvarnish/vev.c
   branches/2.1/varnish-cache/lib/libvcl/vcc_dir_random.c
   branches/2.1/varnish-cache/lib/libvcl/vcc_parse.c
Log:
Merge r4637: White-space fixups



Property changes on: branches/2.1
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:4640
   + /trunk:4637,4640

Modified: branches/2.1/varnish-cache/bin/varnishadm/varnishadm.c
===================================================================
--- branches/2.1/varnish-cache/bin/varnishadm/varnishadm.c	2010-04-19 09:59:19 UTC (rev 4670)
+++ branches/2.1/varnish-cache/bin/varnishadm/varnishadm.c	2010-04-19 10:19:46 UTC (rev 4671)
@@ -169,7 +169,7 @@
 		assert(i > 0);
 		if (fds[0].revents & POLLIN) {
 			n = read(fds[0].fd, buf, sizeof buf);
-			if (n == 0) 
+			if (n == 0)
 				exit (0);
 			if (n < 0) {
 				perror("Read error reading CLI socket");
@@ -241,9 +241,9 @@
 	assert(T_arg != NULL);
 	sock = cli_sock(T_arg, S_arg);
 
-	if (argc > 0) 
+	if (argc > 0)
 		do_args(sock, argc, argv);
-	else 
+	else
 		pass(sock);
 
 	exit(0);


Property changes on: branches/2.1/varnish-cache/bin/varnishd/cache_backend.h
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/varnish-cache/bin/varnishd/cache_backend.h:4637


Property changes on: branches/2.1/varnish-cache/bin/varnishd/cache_backend_cfg.c
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/varnish-cache/bin/varnishd/cache_backend_cfg.c:4637

Modified: branches/2.1/varnish-cache/bin/varnishd/mgt_pool.c
===================================================================
--- branches/2.1/varnish-cache/bin/varnishd/mgt_pool.c	2010-04-19 09:59:19 UTC (rev 4670)
+++ branches/2.1/varnish-cache/bin/varnishd/mgt_pool.c	2010-04-19 10:19:46 UTC (rev 4671)
@@ -68,7 +68,7 @@
 }
 
 /*--------------------------------------------------------------------
- * This is utterly ridiculous:  POSIX does not guarantee that the 
+ * This is utterly ridiculous:  POSIX does not guarantee that the
  * minimum thread stack size is a compile time constant.
  * XXX: "32" is a magic marker for 32bit systems.
  */


Property changes on: branches/2.1/varnish-cache/bin/varnishd/vparam.h
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/varnish-cache/bin/varnishd/vparam.h:4637


Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/c00019.vtc
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/varnish-cache/bin/varnishtest/tests/c00019.vtc:4637


Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/r00325.vtc
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/varnish-cache/bin/varnishtest/tests/r00325.vtc:4637


Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/r00416.vtc
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/varnish-cache/bin/varnishtest/tests/r00416.vtc:4637


Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/v00011.vtc
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/varnish-cache/bin/varnishtest/tests/v00011.vtc:4637


Property changes on: branches/2.1/varnish-cache/include/vct.h
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/varnish-cache/include/vct.h:4637


Property changes on: branches/2.1/varnish-cache/include/vev.h
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/varnish-cache/include/vev.h:4637


Property changes on: branches/2.1/varnish-cache/lib/libvarnish/tcp.c
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/varnish-cache/lib/libvarnish/tcp.c:4637


Property changes on: branches/2.1/varnish-cache/lib/libvarnish/vev.c
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/varnish-cache/lib/libvarnish/vev.c:4637


Property changes on: branches/2.1/varnish-cache/lib/libvcl/vcc_dir_random.c
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/varnish-cache/lib/libvcl/vcc_dir_random.c:4637

Modified: branches/2.1/varnish-cache/lib/libvcl/vcc_parse.c
===================================================================
--- branches/2.1/varnish-cache/lib/libvcl/vcc_parse.c	2010-04-19 09:59:19 UTC (rev 4670)
+++ branches/2.1/varnish-cache/lib/libvcl/vcc_parse.c	2010-04-19 10:19:46 UTC (rev 4671)
@@ -569,7 +569,7 @@
 
 /*--------------------------------------------------------------------
  * Top level of parser, recognize:
- * 	Inline C-code
+ *	Inline C-code
  *	ACL definitions
  *	Function definitions
  *	Backend & Director definitions