[master] dce78a8 keep PRIV_* out of vmod documentation

Nils Goroll nils.goroll at uplex.de
Wed Nov 15 14:39:06 UTC 2017


commit dce78a8cfcbbad51bf6eff0794a7f909004530b0
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Wed Nov 15 15:35:47 2017 +0100

    keep PRIV_* out of vmod documentation
    
    Fixes #2448

diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index bed65e4..9f105f6 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -86,6 +86,12 @@ CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \\
 \t$(builddir)/vmod_XXX.man.rst
 
 '''
+privs = {
+    'PRIV_CALL':   "struct vmod_priv *",
+    'PRIV_VCL':    "struct vmod_priv *",
+    'PRIV_TASK':   "struct vmod_priv *",
+    'PRIV_TOP':    "struct vmod_priv *",
+}
 
 ctypes = {
     'ACL':         "VCL_ACL",
@@ -100,10 +106,6 @@ ctypes = {
     'HTTP':        "VCL_HTTP",
     'INT':         "VCL_INT",
     'IP':          "VCL_IP",
-    'PRIV_CALL':   "struct vmod_priv *",
-    'PRIV_VCL':    "struct vmod_priv *",
-    'PRIV_TASK':   "struct vmod_priv *",
-    'PRIV_TOP':    "struct vmod_priv *",
     'PROBE':       "VCL_PROBE",
     'REAL':        "VCL_REAL",
     'STEVEDORE':   "VCL_STEVEDORE",
@@ -113,6 +115,8 @@ ctypes = {
     'VOID':        "VCL_VOID",
 }
 
+ctypes.update(privs)
+
 #######################################################################
 
 
@@ -342,6 +346,8 @@ class prototype(object):
         l = []
         for i in self.args:
             t = i.vcl()
+            if t in privs:
+                continue
             if not short:
                 if i.nm is not None:
                     t += " " + i.nm


More information about the varnish-commit mailing list