[master] 88624c7 Remove unneeded vmod::fini stuff, the vmod_priv::delete serves that purpose.

Poul-Henning Kamp phk at varnish-cache.org
Wed Mar 6 18:30:41 CET 2013


commit 88624c7c97e4b5b35cbec1b67c1ec4a5ad684e05
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Mar 6 17:30:04 2013 +0000

    Remove unneeded vmod::fini stuff, the vmod_priv::delete serves
    that purpose.

diff --git a/lib/libvcl/vmodtool.py b/lib/libvcl/vmodtool.py
index 4d964cf..97fd398 100755
--- a/lib/libvcl/vmodtool.py
+++ b/lib/libvcl/vmodtool.py
@@ -97,7 +97,6 @@ class vmod(object):
 			raise Exception("Module name '%s' is illegal" % nam)
 		self.nam = nam
 		self.init = None
-		self.fini = None
 		self.funcs = list()
 		self.objs = list()
 
@@ -108,13 +107,6 @@ class vmod(object):
 			raise Exception("Init name '%s' is illegal" % nam)
 		self.init = nam
 
-	def set_fini(self, nam):
-		if self.fini != None:
-			raise Exception("Module %s already has Fini" % self.nam)
-		if not is_c_name(nam):
-			raise Exception("Fini name '%s' is illegal" % nam)
-		self.fini = nam
-
 	def add_func(self, fn):
 		self.funcs.append(fn)
 
@@ -131,10 +123,6 @@ class vmod(object):
 			fo.write("int " + self.init)
 			fo.write(
 			    "(struct vmod_priv *, const struct VCL_conf *);\n")
-		if self.fini != None:
-			fo.write("int " + self.fini)
-			fo.write(
-			    "(struct vmod_priv *, const struct VCL_conf *);\n")
 		fo.write("extern const void * const Vmod_Id;\n")
 
 	def c_typedefs_(self):
@@ -193,8 +181,6 @@ class vmod(object):
 		s += "\n\t/* Init/Fini */\n"
 		if self.init != None:
 			s += "\t" + self.init + ",\n"
-		if self.fini != None:
-			s += "\t" + self.fini + ",\n"
 		s += "};"
 
 		return s
@@ -211,8 +197,6 @@ class vmod(object):
 		s += "\n\t/* Init/Fini */\n"
 		if self.init != None:
 			s += "\tvmod_init_f\t*_init;\n"
-		if self.fini != None:
-			s += "\tvmod_fini_f\t*_fini;\n"
 		s += '}'
 		return s
 
@@ -229,8 +213,6 @@ class vmod(object):
 		s += "\n\t/* Init/Fini */\n"
 		if self.init != None:
 			s += '\t"INIT\\0Vmod_Func_' + self.nam + '._init",\n'
-		if self.fini != None:
-			s += '\t"FINI\\0Vmod_Func_' + self.nam + '._fini",\n'
 
 		s += "\t0\n"
 		s += "};\n"
@@ -512,9 +494,6 @@ while len(tl) > 0:
 	if t.str == "Init":
 		t = tl.pop(0)
 		vmod.set_init(t.str)
-	elif t.str == "Fini":
-		t = tl.pop(0)
-		vmod.set_fini(t.str)
 	elif t.str == "Function":
 		f = parse_func(tl)
 		vmod.add_func(f)



More information about the varnish-commit mailing list