[4.1] 7b16449 Polish
Lasse Karstensen
lkarsten at varnish-software.com
Thu Feb 25 15:11:14 CET 2016
commit 7b164496abbe6dabd89bc5abd818d2b37319e06b
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date: Wed Feb 24 15:04:25 2016 +0000
Polish
diff --git a/doc/sphinx/reference/vmod.rst b/doc/sphinx/reference/vmod.rst
index 3020b5d..d3271b5 100644
--- a/doc/sphinx/reference/vmod.rst
+++ b/doc/sphinx/reference/vmod.rst
@@ -118,7 +118,7 @@ etc.
ACL
C-type: ``const struct vrt_acl *``
- A type for named ACLs declared in VCL.
+ A type for named ACLs declared in VCL.
BACKEND
C-type: ``const struct director *``
@@ -152,9 +152,9 @@ DURATION
A time interval, as in 25 seconds.
ENUM
- C-type: ``const char *``
+ C-type: ``const char *``
- TODO
+ TODO
HEADER
C-type: ``const struct gethdr_s *``
@@ -169,9 +169,9 @@ HEADER
the value, but not where it came from.
HTTP
- C-type: ``struct http *``
+ C-type: ``struct http *``
- TODO
+ TODO
INT
C-type: ``long``
diff --git a/include/vrt.h b/include/vrt.h
index 449d8b1..cc7fc20 100644
--- a/include/vrt.h
+++ b/include/vrt.h
@@ -239,12 +239,12 @@ struct vrt_ref {
/* ACL related */
#define VRT_ACL_MAXADDR 16 /* max(IPv4, IPv6) */
-typedef int acl_f (VRT_CTX, VCL_IP);
+typedef int acl_match_f(VRT_CTX, const VCL_IP);
struct vrt_acl {
unsigned magic;
#define VRT_ACL_MAGIC 0x78329d96
- acl_f *match;
+ acl_match_f *match;
};
void VRT_acl_log(VRT_CTX, const char *msg);
diff --git a/lib/libvcc/vcc_acl.c b/lib/libvcc/vcc_acl.c
index 2fc5fa4..97728a9 100644
--- a/lib/libvcc/vcc_acl.c
+++ b/lib/libvcc/vcc_acl.c
@@ -351,7 +351,7 @@ vcc_acl_emit(struct vcc *tl, const char *acln, int anon)
struct token *t;
struct inifin *ifp;
- Fh(tl, 0, "\nstatic int __match_proto__(acl_f)\n");
+ Fh(tl, 0, "\nstatic int __match_proto__(acl_match_f)\n");
Fh(tl, 0,
"match_acl_%s_%s(VRT_CTX, const VCL_IP p)\n",
anon ? "anon" : "named", acln);
@@ -364,7 +364,7 @@ vcc_acl_emit(struct vcc *tl, const char *acln, int anon)
Fh(tl, 0, "\t\tVRT_acl_log(ctx, \"NO_FAM %s\");\n", acln);
Fh(tl, 0, "\t\treturn(0);\n");
Fh(tl, 0, "\t}\n\n");
- if (!tl->param->err_unref && !anon ) {
+ if (!tl->param->err_unref && !anon) {
ifp = New_IniFin(tl);
VSB_printf(ifp->ini,
"\tif (0) match_acl_named_%s(0, 0);\n", acln);
@@ -419,9 +419,9 @@ vcc_acl_emit(struct vcc *tl, const char *acln, int anon)
t = ae->t_addr;
do {
if (t->tok == CSTR) {
- Fh(tl, 0, " \"\\\"\" " );
+ Fh(tl, 0, " \"\\\"\" ");
EncToken(tl->fh, t);
- Fh(tl, 0, " \"\\\"\" " );
+ Fh(tl, 0, " \"\\\"\" ");
} else
Fh(tl, 0, " \"%.*s\"", PF(t));
if (t == ae->t_mask)
More information about the varnish-commit
mailing list