r2750 - trunk/varnish-cache/bin/varnishd

phk at projects.linpro.no phk at projects.linpro.no
Fri Jun 20 23:16:22 CEST 2008


Author: phk
Date: 2008-06-20 23:16:22 +0200 (Fri, 20 Jun 2008)
New Revision: 2750

Modified:
   trunk/varnish-cache/bin/varnishd/cache.h
   trunk/varnish-cache/bin/varnishd/cache_ban.c
   trunk/varnish-cache/bin/varnishd/cache_vrt.c
Log:
Rename AddBan() to BAN_Add() for consistency.



Modified: trunk/varnish-cache/bin/varnishd/cache.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache.h	2008-06-20 15:49:10 UTC (rev 2749)
+++ trunk/varnish-cache/bin/varnishd/cache.h	2008-06-20 21:16:22 UTC (rev 2750)
@@ -426,7 +426,7 @@
 void VBE_SelectBackend(struct sess *sp);
 
 /* cache_ban.c */
-void AddBan(const char *, int hash);
+void BAN_Add(const char *, int hash);
 void BAN_Init(void);
 void BAN_NewObj(struct object *o);
 void BAN_DestroyObj(struct object *o);

Modified: trunk/varnish-cache/bin/varnishd/cache_ban.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_ban.c	2008-06-20 15:49:10 UTC (rev 2749)
+++ trunk/varnish-cache/bin/varnishd/cache_ban.c	2008-06-20 21:16:22 UTC (rev 2750)
@@ -66,7 +66,7 @@
 static struct ban * volatile ban_start;
 
 void
-AddBan(const char *regexp, int hash)
+BAN_Add(const char *regexp, int hash)
 {
 	struct ban *b;
 	int i;
@@ -179,7 +179,7 @@
 {
 
 	(void)priv;
-	AddBan(av[2], 0);
+	BAN_Add(av[2], 0);
 	cli_out(cli, "URL_PURGE %s\n", av[2]);
 }
 
@@ -188,7 +188,7 @@
 {
 
 	(void)priv;
-	AddBan(av[2], 1);
+	BAN_Add(av[2], 1);
 	cli_out(cli, "HASH_PURGE %s\n", av[2]);
 }
 
@@ -235,5 +235,6 @@
 
 	MTX_INIT(&ban_mtx);
 	CLI_AddFuncs(PUBLIC_CLI, ban_cmds);
-	AddBan("^\001$", 0);
+	/* Add an initial ban, since the list can never be empty */
+	BAN_Add(".", 0);
 }

Modified: trunk/varnish-cache/bin/varnishd/cache_vrt.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt.c	2008-06-20 15:49:10 UTC (rev 2749)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt.c	2008-06-20 21:16:22 UTC (rev 2750)
@@ -638,7 +638,7 @@
 VRT_purge(const char *regexp, int hash)
 {
 	
-	AddBan(regexp, hash);
+	BAN_Add(regexp, hash);
 }
 
 /*--------------------------------------------------------------------




More information about the varnish-commit mailing list