r1992 - in branches/1.1: . bin/varnishd

des at projects.linpro.no des at projects.linpro.no
Sun Sep 23 15:15:04 CEST 2007


Author: des
Date: 2007-09-23 15:15:03 +0200 (Sun, 23 Sep 2007)
New Revision: 1992

Modified:
   branches/1.1/
   branches/1.1/bin/varnishd/cache.h
Log:
Merged revisions 1883 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r1883 | phk | 2007-08-20 12:36:16 +0200 (Mon, 20 Aug 2007) | 7 lines
  
  Make the new FlexeLint 8.00w happy again.
  
  It's a fine point of C-linguistics, but I have to admit that in
  certain universes it would have a point.  Not this one though.
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1798,1800-1808,1810-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1884,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949
   + /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1798,1800-1808,1810-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949

Modified: branches/1.1/bin/varnishd/cache.h
===================================================================
--- branches/1.1/bin/varnishd/cache.h	2007-09-23 13:11:51 UTC (rev 1991)
+++ branches/1.1/bin/varnishd/cache.h	2007-09-23 13:15:03 UTC (rev 1992)
@@ -107,6 +107,12 @@
 	char			*e;
 };
 
+enum httpwhence {
+	HTTP_Rx,
+	HTTP_Tx,
+	HTTP_Obj
+};
+
 struct http {
 	unsigned		magic;
 #define HTTP_MAGIC		0x6428b5c9
@@ -116,11 +122,7 @@
 	char			*pl_s, *pl_e;	/* Pipelined bytes */
 
 	unsigned char		conds;		/* If-* headers present */
-	enum httpwhence {
-		HTTP_Rx,
-		HTTP_Tx,
-		HTTP_Obj
-	}			logtag;
+	enum httpwhence 	logtag;
 
 	struct http_hdr		hd[HTTP_HDR_MAX];
 	unsigned char		hdf[HTTP_HDR_MAX];




More information about the varnish-commit mailing list