r2146 - in branches/1.1: . lib/libvarnish

[des at projects.linpro.no]

Author: des
Date: 2007-10-19 13:36:35 +0200 (Fri, 19 Oct 2007)
New Revision: 2146

Modified:
   branches/1.1/
   branches/1.1/lib/libvarnish/assert.c
   branches/1.1/lib/libvarnish/binary_heap.c
   branches/1.1/lib/libvarnish/crc32.c
   branches/1.1/lib/libvarnish/vss.c
Log:
Merged revisions 2107 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2107 | des | 2007-10-16 16:15:54 +0200 (Tue, 16 Oct 2007) | 2 lines
  
  Whitespace cleanup.
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2078-2079,2088,2097,2106,2133
   + /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2078-2079,2088,2097,2106-2107,2133

Modified: branches/1.1/lib/libvarnish/assert.c
===================================================================
--- branches/1.1/lib/libvarnish/assert.c	2007-10-19 11:36:22 UTC (rev 2145)
+++ branches/1.1/lib/libvarnish/assert.c	2007-10-19 11:36:35 UTC (rev 2146)
@@ -57,4 +57,3 @@
 	    "  errno = %d (%s)\n", func, file, line, cond, err, strerror(err));
 	abort();
 }
-

Modified: branches/1.1/lib/libvarnish/binary_heap.c
===================================================================
--- branches/1.1/lib/libvarnish/binary_heap.c	2007-10-19 11:36:22 UTC (rev 2145)
+++ branches/1.1/lib/libvarnish/binary_heap.c	2007-10-19 11:36:35 UTC (rev 2146)
@@ -298,7 +298,7 @@
 #else
 
 struct foo {
-	unsigned 	idx;
+	unsigned	idx;
 	unsigned	key;
 };
 

Modified: branches/1.1/lib/libvarnish/crc32.c
===================================================================
--- branches/1.1/lib/libvarnish/crc32.c	2007-10-19 11:36:22 UTC (rev 2145)
+++ branches/1.1/lib/libvarnish/crc32.c	2007-10-19 11:36:35 UTC (rev 2146)
@@ -99,4 +99,3 @@
 	crc = crc32(~0U, p1, l);
 	return (crc ^ ~0U);
 }
-

Modified: branches/1.1/lib/libvarnish/vss.c
===================================================================
--- branches/1.1/lib/libvarnish/vss.c	2007-10-19 11:36:22 UTC (rev 2145)
+++ branches/1.1/lib/libvarnish/vss.c	2007-10-19 11:36:35 UTC (rev 2146)
@@ -127,14 +127,14 @@
 	struct vss_addr **va;
 	int i, ret;
 
-        memset(&hints, 0, sizeof hints);
-        hints.ai_socktype = SOCK_STREAM;
-        hints.ai_flags = AI_PASSIVE;
-        ret = getaddrinfo(addr, port, &hints, &res0);
-        if (ret != 0) {
-                fprintf(stderr, "getaddrinfo(): %s\n", gai_strerror(ret));
-                return (0);
-        }
+	memset(&hints, 0, sizeof hints);
+	hints.ai_socktype = SOCK_STREAM;
+	hints.ai_flags = AI_PASSIVE;
+	ret = getaddrinfo(addr, port, &hints, &res0);
+	if (ret != 0) {
+		fprintf(stderr, "getaddrinfo(): %s\n", gai_strerror(ret));
+		return (0);
+	}
 	for (res = res0, i = 0; res != NULL; res = res->ai_next)
 		++i;
 	va = calloc(i, sizeof *va);