[master] 280495d Clean up some function arguments
Poul-Henning Kamp
phk at FreeBSD.org
Wed Jan 24 09:27:13 UTC 2018
commit 280495dc1c4e43987308a0ffc5f9fdf87156a83c
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Wed Jan 24 08:54:00 2018 +0000
Clean up some function arguments
diff --git a/lib/libvcc/vcc_acl.c b/lib/libvcc/vcc_acl.c
index d11f926..ca27856 100644
--- a/lib/libvcc/vcc_acl.c
+++ b/lib/libvcc/vcc_acl.c
@@ -462,7 +462,6 @@ vcc_acl_emit(struct vcc *tl, const char *name, const char *rname, int anon)
void
vcc_ParseAcl(struct vcc *tl)
{
- struct token *an;
struct symbol *sym;
vcc_NextToken(tl);
@@ -470,10 +469,9 @@ vcc_ParseAcl(struct vcc *tl)
vcc_ExpectVid(tl, "ACL");
ERRCHK(tl);
- an = tl->t;
+ sym = VCC_HandleSymbol(tl, ACL, ACL_SYMBOL_PREFIX);
vcc_NextToken(tl);
- sym = VCC_HandleSymbol(tl, an, ACL, ACL_SYMBOL_PREFIX);
ERRCHK(tl);
AN(sym);
diff --git a/lib/libvcc/vcc_action.c b/lib/libvcc/vcc_action.c
index 69adcec..b030c11 100644
--- a/lib/libvcc/vcc_action.c
+++ b/lib/libvcc/vcc_action.c
@@ -90,7 +90,7 @@ parse_set(struct vcc *tl)
vcc_NextToken(tl);
ExpectErr(tl, ID);
- sym = vcc_FindVar(tl, tl->t, 1, "cannot be set");
+ sym = vcc_FindVar(tl, 1, "cannot be set");
ERRCHK(tl);
assert(sym != NULL);
if (vcc_IdIs(tl->t, "bereq.body")) {
@@ -138,7 +138,7 @@ parse_unset(struct vcc *tl)
/* XXX: Wrong, should use VCC_Expr(HEADER) */
vcc_NextToken(tl);
ExpectErr(tl, ID);
- sym = vcc_FindVar(tl, tl->t, 1, "cannot be unset");
+ sym = vcc_FindVar(tl, 1, "cannot be unset");
ERRCHK(tl);
assert(sym != NULL);
if (sym->fmt != HEADER && !vcc_IdIs(tl->t, "bereq.body")) {
diff --git a/lib/libvcc/vcc_backend.c b/lib/libvcc/vcc_backend.c
index a5a433f..ed4aa50 100644
--- a/lib/libvcc/vcc_backend.c
+++ b/lib/libvcc/vcc_backend.c
@@ -258,9 +258,9 @@ vcc_ParseProbe(struct vcc *tl)
vcc_ExpectVid(tl, "backend probe"); /* ID: name */
ERRCHK(tl);
t_probe = tl->t;
+ sym = VCC_HandleSymbol(tl, PROBE, "vgc_probe");
vcc_NextToken(tl);
- sym = VCC_HandleSymbol(tl, t_probe, PROBE, "vgc_probe");
ERRCHK(tl);
AN(sym);
@@ -473,9 +473,9 @@ vcc_ParseBackend(struct vcc *tl)
ERRCHK(tl);
t_be = tl->t;
+ sym = VCC_HandleSymbol(tl, BACKEND, "vgc_backend");
vcc_NextToken(tl);
- sym = VCC_HandleSymbol(tl, t_be, BACKEND, "vgc_backend");
ERRCHK(tl);
Fh(tl, 0, "\nstatic struct director *%s;\n", sym->rname);
diff --git a/lib/libvcc/vcc_compile.h b/lib/libvcc/vcc_compile.h
index cff6c8f..4e98e94 100644
--- a/lib/libvcc/vcc_compile.h
+++ b/lib/libvcc/vcc_compile.h
@@ -292,8 +292,7 @@ void vcc_Eval_Func(struct vcc *tl, const char *spec,
const char *extra, const struct symbol *sym);
enum symkind VCC_HandleKind(vcc_type_t fmt);
void VCC_GlobalSymbol(struct symbol *, vcc_type_t fmt, const char *pfx);
-struct symbol *VCC_HandleSymbol(struct vcc *, const struct token *,
- vcc_type_t fmt, const char *pfx);
+struct symbol *VCC_HandleSymbol(struct vcc *, vcc_type_t , const char *);
/* vcc_obj.c */
extern const struct var vcc_vars[];
@@ -348,8 +347,7 @@ vcc_type_t VCC_Type(const char *p);
/* vcc_var.c */
sym_wildcard_t vcc_Var_Wildcard;
-const struct symbol *vcc_FindVar(struct vcc *tl, const struct token *t,
- int wr_access, const char *use);
+const struct symbol *vcc_FindVar(struct vcc *, int, const char *);
/* vcc_vmod.c */
void vcc_ParseImport(struct vcc *tl);
diff --git a/lib/libvcc/vcc_symb.c b/lib/libvcc/vcc_symb.c
index 8342a89..ef526f1 100644
--- a/lib/libvcc/vcc_symb.c
+++ b/lib/libvcc/vcc_symb.c
@@ -228,8 +228,7 @@ VCC_GlobalSymbol(struct symbol *sym, vcc_type_t fmt, const char *pfx)
}
struct symbol *
-VCC_HandleSymbol(struct vcc *tl, const struct token *tk, vcc_type_t fmt,
- const char *pfx)
+VCC_HandleSymbol(struct vcc *tl, vcc_type_t fmt, const char *pfx)
{
struct symbol *sym;
enum symkind kind;
@@ -238,19 +237,19 @@ VCC_HandleSymbol(struct vcc *tl, const struct token *tk, vcc_type_t fmt,
kind = VCC_HandleKind(fmt);
assert(kind != SYM_NONE);
- sym = VCC_SymbolTok(tl, NULL, tk, SYM_NONE, 0);
+ sym = VCC_SymbolTok(tl, NULL, tl->t, SYM_NONE, 0);
if (sym != NULL && sym->def_b != NULL && kind == sym->kind) {
p = VCC_SymKind(tl, sym);
VSB_printf(tl->sb, "%c%s '%.*s' redefined.\n",
- toupper(*p), p + 1, PF(tk));
- vcc_ErrWhere(tl, tk);
+ toupper(*p), p + 1, PF(tl->t));
+ vcc_ErrWhere(tl, tl->t);
VSB_printf(tl->sb, "First definition:\n");
AN(sym->def_b);
vcc_ErrWhere(tl, sym->def_b);
return (sym);
} else if (sym != NULL && sym->def_b != NULL) {
- VSB_printf(tl->sb, "Name '%.*s' already defined.\n", PF(tk));
- vcc_ErrWhere(tl, tk);
+ VSB_printf(tl->sb, "Name '%.*s' already defined.\n", PF(tl->t));
+ vcc_ErrWhere(tl, tl->t);
VSB_printf(tl->sb, "First definition:\n");
AN(sym->def_b);
vcc_ErrWhere(tl, sym->def_b);
@@ -258,17 +257,17 @@ VCC_HandleSymbol(struct vcc *tl, const struct token *tk, vcc_type_t fmt,
} else if (sym != NULL && sym->kind != kind) {
VSB_printf(tl->sb,
"Name %.*s must have type '%s'.\n",
- PF(tk), VCC_SymKind(tl, sym));
- vcc_ErrWhere(tl, tk);
+ PF(tl->t), VCC_SymKind(tl, sym));
+ vcc_ErrWhere(tl, tl->t);
return (sym);
}
if (sym == NULL)
- sym = VCC_SymbolTok(tl, NULL, tk, kind, 1);
+ sym = VCC_SymbolTok(tl, NULL, tl->t, kind, 1);
AN(sym);
AZ(sym->ndef);
VCC_GlobalSymbol(sym, fmt, pfx);
sym->ndef = 1;
if (sym->def_b == NULL)
- sym->def_b = tk;
+ sym->def_b = tl->t;
return (sym);
}
diff --git a/lib/libvcc/vcc_var.c b/lib/libvcc/vcc_var.c
index 4058b4d..02c4e5e 100644
--- a/lib/libvcc/vcc_var.c
+++ b/lib/libvcc/vcc_var.c
@@ -96,39 +96,38 @@ vcc_Var_Wildcard(struct vcc *tl, struct symbol *parent,
/*--------------------------------------------------------------------*/
const struct symbol *
-vcc_FindVar(struct vcc *tl, const struct token *t, int wr_access,
- const char *use)
+vcc_FindVar(struct vcc *tl, int wr_access, const char *use)
{
const struct symbol *sym;
- sym = VCC_SymbolTok(tl, NULL, t, SYM_VAR, 0);
+ sym = VCC_SymbolTok(tl, NULL, tl->t, SYM_VAR, 0);
if (tl->err)
return (NULL);
if (sym != NULL) {
if (wr_access && sym->w_methods == 0) {
VSB_printf(tl->sb, "Variable ");
- vcc_ErrToken(tl, t);
+ vcc_ErrToken(tl, tl->t);
VSB_printf(tl->sb, " is read only.");
VSB_cat(tl->sb, "\nAt: ");
- vcc_ErrWhere(tl, t);
+ vcc_ErrWhere(tl, tl->t);
return (NULL);
} else if (wr_access) {
- vcc_AddUses(tl, t, sym->w_methods, use);
+ vcc_AddUses(tl, tl->t, sym->w_methods, use);
} else if (sym->r_methods == 0) {
VSB_printf(tl->sb, "Variable ");
- vcc_ErrToken(tl, t);
+ vcc_ErrToken(tl, tl->t);
VSB_printf(tl->sb, " is write only.");
VSB_cat(tl->sb, "\nAt: ");
- vcc_ErrWhere(tl, t);
+ vcc_ErrWhere(tl, tl->t);
return (NULL);
} else {
- vcc_AddUses(tl, t, sym->r_methods, use);
+ vcc_AddUses(tl, tl->t, sym->r_methods, use);
}
return (sym);
}
VSB_printf(tl->sb, "Unknown variable ");
- vcc_ErrToken(tl, t);
+ vcc_ErrToken(tl, tl->t);
VSB_cat(tl->sb, "\nAt: ");
- vcc_ErrWhere(tl, t);
+ vcc_ErrWhere(tl, tl->t);
return (NULL);
}
diff --git a/lib/libvcc/vcc_vmod.c b/lib/libvcc/vcc_vmod.c
index 9a3344d..0cc0725 100644
--- a/lib/libvcc/vcc_vmod.c
+++ b/lib/libvcc/vcc_vmod.c
@@ -75,9 +75,9 @@ vcc_ParseImport(struct vcc *tl)
ExpectErr(tl, ID);
mod = tl->t;
+ osym = VCC_SymbolTok(tl, NULL, tl->t, SYM_NONE, 0);
vcc_NextToken(tl);
- osym = VCC_SymbolTok(tl, NULL, mod, SYM_NONE, 0);
if (osym != NULL && osym->kind != SYM_VMOD) {
VSB_printf(tl->sb, "Module %.*s conflicts with other symbol.\n",
PF(mod));
@@ -278,7 +278,7 @@ vcc_ParseNew(struct vcc *tl)
ExpectErr(tl, ID);
vcc_ExpectVid(tl, "VCL object");
ERRCHK(tl);
- sy1 = VCC_HandleSymbol(tl, tl->t, INSTANCE, "vo");
+ sy1 = VCC_HandleSymbol(tl, INSTANCE, "vo");
ERRCHK(tl);
/* We allow implicit use of VMOD objects: Pretend it's ref'ed */
More information about the varnish-commit
mailing list