Commit 88624c7c authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Remove unneeded vmod::fini stuff, the vmod_priv::delete serves

that purpose.
parent fdbd28d4
...@@ -97,7 +97,6 @@ class vmod(object): ...@@ -97,7 +97,6 @@ class vmod(object):
raise Exception("Module name '%s' is illegal" % nam) raise Exception("Module name '%s' is illegal" % nam)
self.nam = nam self.nam = nam
self.init = None self.init = None
self.fini = None
self.funcs = list() self.funcs = list()
self.objs = list() self.objs = list()
...@@ -108,13 +107,6 @@ class vmod(object): ...@@ -108,13 +107,6 @@ class vmod(object):
raise Exception("Init name '%s' is illegal" % nam) raise Exception("Init name '%s' is illegal" % nam)
self.init = 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): def add_func(self, fn):
self.funcs.append(fn) self.funcs.append(fn)
...@@ -131,10 +123,6 @@ class vmod(object): ...@@ -131,10 +123,6 @@ class vmod(object):
fo.write("int " + self.init) fo.write("int " + self.init)
fo.write( fo.write(
"(struct vmod_priv *, const struct VCL_conf *);\n") "(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") fo.write("extern const void * const Vmod_Id;\n")
def c_typedefs_(self): def c_typedefs_(self):
...@@ -193,8 +181,6 @@ class vmod(object): ...@@ -193,8 +181,6 @@ class vmod(object):
s += "\n\t/* Init/Fini */\n" s += "\n\t/* Init/Fini */\n"
if self.init != None: if self.init != None:
s += "\t" + self.init + ",\n" s += "\t" + self.init + ",\n"
if self.fini != None:
s += "\t" + self.fini + ",\n"
s += "};" s += "};"
return s return s
...@@ -211,8 +197,6 @@ class vmod(object): ...@@ -211,8 +197,6 @@ class vmod(object):
s += "\n\t/* Init/Fini */\n" s += "\n\t/* Init/Fini */\n"
if self.init != None: if self.init != None:
s += "\tvmod_init_f\t*_init;\n" s += "\tvmod_init_f\t*_init;\n"
if self.fini != None:
s += "\tvmod_fini_f\t*_fini;\n"
s += '}' s += '}'
return s return s
...@@ -229,8 +213,6 @@ class vmod(object): ...@@ -229,8 +213,6 @@ class vmod(object):
s += "\n\t/* Init/Fini */\n" s += "\n\t/* Init/Fini */\n"
if self.init != None: if self.init != None:
s += '\t"INIT\\0Vmod_Func_' + self.nam + '._init",\n' 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 += "\t0\n"
s += "};\n" s += "};\n"
...@@ -512,9 +494,6 @@ while len(tl) > 0: ...@@ -512,9 +494,6 @@ while len(tl) > 0:
if t.str == "Init": if t.str == "Init":
t = tl.pop(0) t = tl.pop(0)
vmod.set_init(t.str) vmod.set_init(t.str)
elif t.str == "Fini":
t = tl.pop(0)
vmod.set_fini(t.str)
elif t.str == "Function": elif t.str == "Function":
f = parse_func(tl) f = parse_func(tl)
vmod.add_func(f) vmod.add_func(f)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment