r173 - trunk/varnish-cache/bin/varnishd

phk at projects.linpro.no phk at projects.linpro.no
Tue Jun 13 10:05:33 CEST 2006


Author: phk
Date: 2006-06-13 10:05:33 +0200 (Tue, 13 Jun 2006)
New Revision: 173

Added:
   trunk/varnish-cache/bin/varnishd/stevedore.h
Removed:
   trunk/varnish-cache/bin/varnishd/_stevedore.h
Modified:
   trunk/varnish-cache/bin/varnishd/cache.h
   trunk/varnish-cache/bin/varnishd/mgt.h
Log:
After having a strong cup of tea: don't name files with leading underscore
even though that's how FreeBSD's kernel does it.  In my private world
a leading underscore means "junk file, remove at your pleasure".



Deleted: trunk/varnish-cache/bin/varnishd/_stevedore.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/_stevedore.h	2006-06-13 08:02:59 UTC (rev 172)
+++ trunk/varnish-cache/bin/varnishd/_stevedore.h	2006-06-13 08:05:33 UTC (rev 173)
@@ -1,21 +0,0 @@
-/*
- * $Id: cache.h 164 2006-05-01 12:45:20Z phk $
- */
-
-struct stevedore;
-
-typedef void storage_init_f(struct stevedore *, const char *spec);
-typedef void storage_open_f(struct stevedore *);
-typedef struct storage *storage_alloc_f(struct stevedore *, size_t size);
-typedef void storage_free_f(struct storage *);
-
-struct stevedore {
-	const char		*name;
-	storage_init_f		*init;	/* called by mgt process */
-	storage_open_f		*open;	/* called by cache process */
-	storage_alloc_f		*alloc;
-	storage_free_f		*free;
-
-	/* private fields */
-	void			*priv;
-};

Modified: trunk/varnish-cache/bin/varnishd/cache.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache.h	2006-06-13 08:02:59 UTC (rev 172)
+++ trunk/varnish-cache/bin/varnishd/cache.h	2006-06-13 08:05:33 UTC (rev 173)
@@ -45,7 +45,7 @@
 	struct stevedore	*stevedore;
 };
 
-#include "_stevedore.h"
+#include "stevedore.h"
 
 /*
  * XXX: in the longer term, we want to support multiple stevedores,

Modified: trunk/varnish-cache/bin/varnishd/mgt.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt.h	2006-06-13 08:02:59 UTC (rev 172)
+++ trunk/varnish-cache/bin/varnishd/mgt.h	2006-06-13 08:05:33 UTC (rev 173)
@@ -14,7 +14,7 @@
 /* tcp.c */
 int open_tcp(const char *port);
 
-#include "_stevedore.h"
+#include "stevedore.h"
 
 extern struct stevedore sma_stevedore;
 extern struct stevedore smf_stevedore;

Copied: trunk/varnish-cache/bin/varnishd/stevedore.h (from rev 170, trunk/varnish-cache/bin/varnishd/_stevedore.h)




More information about the varnish-commit mailing list