r2867 - in branches/1.1: . lib/libvarnishapi

[des at projects.linpro.no]

Author: des
Date: 2008-06-30 04:32:07 +0200 (Mon, 30 Jun 2008)
New Revision: 2867

Modified:
   branches/1.1/
   branches/1.1/lib/libvarnishapi/shmlog.c
Log:
Merged revisions 2862 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2862 | des | 2008-06-30 03:44:33 +0200 (Mon, 30 Jun 2008) | 2 lines
  
  The correct return value when we reach the end is -1, not 0.
........



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-1889,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,2057,2077-2080,2086,2088,2091,2097,2106-2107,2116,2133,2154,2173,2180-2181,2191-2193,2206-2207,2211-2212,2215-2245,2256-2262,2270-2271,2275,2285-2286,2288-2291,2295-2301,2304-2327,2337,2357-2359,2361-2364,2366,2374-2386,2404,2414-2415,2421-2422,2426,2432-2434,2443-2445,2447,2453-2461,2467,2492-2505,2520-2524,2545,2563-2565,2569,2572,2575-2577
   + /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-1889,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,2057,2077-2080,2086,2088,2091,2097,2106-2107,2116,2133,2154,2173,2180-2181,2191-2193,2206-2207,2211-2212,2215-2245,2256-2262,2270-2271,2275,2285-2286,2288-2291,2295-2301,2304-2327,2337,2357-2359,2361-2364,2366,2374-2386,2404,2414-2415,2421-2422,2426,2432-2434,2443-2445,2447,2453-2461,2467,2492-2505,2520-2524,2545,2563-2565,2569,2572,2575-2577,2862

Modified: branches/1.1/lib/libvarnishapi/shmlog.c
===================================================================
--- branches/1.1/lib/libvarnishapi/shmlog.c	2008-06-30 02:29:59 UTC (rev 2866)
+++ branches/1.1/lib/libvarnishapi/shmlog.c	2008-06-30 02:32:07 UTC (rev 2867)
@@ -297,7 +297,7 @@
 			continue;
 		} else if (vd->keep) {
 			if (--vd->keep == 0)
-				return (0);
+				return (-1);
 		}
 		if (vd->map[p[0]] & M_SELECT) {
 			*pp = p;