Flexelinting

bin/varnishd/flint.lnt

@@ -70,10 +70,9 @@
 
 //////////////
 // Macros defined differently in each VMOD
--esym(767, VPFX)	// macro '___' was defined differently in another module
--esym(767, VARGS)	// macro '___' was defined differently in another module
--esym(767, VENUM)	// macro '___' was defined differently in another module
--esym(14, enum_vmod*)	// Symbol '___' previously defined (___)
+// -esym(767, VPFX)	// macro '___' was defined differently in another module
+// -esym(767, VARGS)	// macro '___' was defined differently in another module
+// -esym(767, VENUM)	// macro '___' was defined differently in another module
 //////////////
 -efunc(1791, pdiff)	// return last on line
 //////////////

flint.lnt

@@ -91,9 +91,9 @@
 ///////////////////////////////////////////////////////////////////////
 // Vmod/vmodtool.py
 
--esym(14, vmod_enum_*)		// Symbol '___' previously defined (___)
--esym(759, vmod_enum_*)		// header declaration for symbol '___' defined at (___)
--esym(765, vmod_enum_*)		// external '___' (___) could be made static
+//-esym(14, vmod_enum_*)		// Symbol '___' previously defined (___)
+//-esym(759, vmod_enum_*)		// header declaration for symbol '___' defined at (___)
+//-esym(765, vmod_enum_*)		// external '___' (___) could be made static
 
 ///////////////////////////////////////////////////////////////////////
 // <vut.h>

lib/libvcc/vmodtool.py

@@ -957,7 +957,9 @@ class vcc(object):
             (self.sympfx, self.modname))
         fo.write('#define VENUM(a) enum_%s%s_##a\n' %
             (self.sympfx, self.modname))
-        fo.write('//lint -esym(755, VPFX)\n')
+        for a in ('VPFX', 'VARGS', 'VENUM'):
+            for b in (755, 767):
+                fo.write('//lint -esym(%d, %s)\n' % (b, a))
         fo.write('//lint -esym(755, VARGS)\n')
         fo.write('//lint -esym(755, VENUM)\n')
         fo.write('\n')
@@ -981,8 +983,12 @@ class vcc(object):
             fo.write("extern VCL_ENUM VENUM(%s);\n" % j)
         fo.write("\n")
         for j in sorted(self.enums):
-            fo.write("//lint -esym(759, enum_%s%s)\n" % (self.sympfx, j))
-            fo.write("//lint -esym(765, enum_%s%s)\n" % (self.sympfx, j))
+            fo.write("//lint -esym(14, enum_%s%s_%s)\n" %
+                (self.sympfx, self.modname, j))
+            fo.write("//lint -esym(759, enum_%s%s_%s)\n" %
+                (self.sympfx, self.modname, j))
+            fo.write("//lint -esym(765, enum_%s%s_%s)\n" %
+                (self.sympfx, self.modname, j))
         fo.write("\n")
 
         for j in self.contents: