r2868 - in branches/1.1: . lib/libvarnishapi

des at projects.linpro.no des at projects.linpro.no
Mon Jun 30 04:39:11 CEST 2008


Author: des
Date: 2008-06-30 04:39:11 +0200 (Mon, 30 Jun 2008)
New Revision: 2868

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

........
  r2863 | des | 2008-06-30 04:03:58 +0200 (Mon, 30 Jun 2008) | 2 lines
  
  Convert from FILE * to fd.
........



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,2862
   + /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-2863

Modified: branches/1.1/lib/libvarnishapi/shmlog.c
===================================================================
--- branches/1.1/lib/libvarnishapi/shmlog.c	2008-06-30 02:32:07 UTC (rev 2867)
+++ branches/1.1/lib/libvarnishapi/shmlog.c	2008-06-30 02:39:11 UTC (rev 2868)
@@ -65,7 +65,7 @@
 	unsigned char		*ptr;
 
 	/* for -r option */
-	FILE			*fi;
+	int			fd;
 	unsigned char		rbuf[5 + 255 + 1];
 
 	int			b_opt;
@@ -171,6 +171,7 @@
 	assert(vd != NULL);
 	vd->regflags = REG_EXTENDED | REG_NOSUB;
 	vd->magic = VSL_MAGIC;
+	vd->fd = -1;
 	return (vd);
 }
 
@@ -192,7 +193,7 @@
 	unsigned char *p;
 
 	CHECK_OBJ_NOTNULL(vd, VSL_MAGIC);
-	if (vd->fi != NULL)
+	if (vd->fd != -1)
 		return (0);
 
 	if (vsl_shmem_map(varnish_name))
@@ -203,7 +204,7 @@
 	vd->logend = vd->logstart + vsl_lh->size;
 	vd->ptr = vd->logstart;
 
-	if (!vd->d_opt && vd->fi == NULL) {
+	if (!vd->d_opt && vd->fd == -1) {
 		for (p = vd->ptr; *p != SLT_ENDMARKER; )
 			p += p[1] + 5;
 		vd->ptr = p;
@@ -232,12 +233,12 @@
 	int i;
 
 	CHECK_OBJ_NOTNULL(vd, VSL_MAGIC);
-	if (vd->fi != NULL) {
-		i = fread(vd->rbuf, 4, 1, vd->fi);
-		if (i != 1)
+	if (vd->fd != -1) {
+		i = read(vd->fd, vd->rbuf, 4);
+		if (i != 4)
 			return (-1);
-		i = fread(vd->rbuf + 4, vd->rbuf[1] + 1, 1, vd->fi);
-		if (i != 1)
+		i = read(vd->fd, vd->rbuf + 4, vd->rbuf[1] + 1);
+		if (i != vd->rbuf[1] + 1)
 			return (-1);
 		*pp = vd->rbuf;
 		return (1);
@@ -387,13 +388,14 @@
 
 	CHECK_OBJ_NOTNULL(vd, VSL_MAGIC);
 	if (!strcmp(opt, "-"))
-		vd->fi = stdin;
+		vd->fd = STDIN_FILENO;
 	else
-		vd->fi = fopen(opt, "r");
-	if (vd->fi != NULL)
-		return (1);
-	perror(opt);
-	return (-1);
+		vd->fd = open(opt, O_RDONLY);
+	if (vd->fd < 0) {
+		perror(opt);
+		return (-1);
+	}
+	return (1);
 }
 
 /*--------------------------------------------------------------------*/




More information about the varnish-commit mailing list