[master] 717e8d5 Eliminate unused argument
Poul-Henning Kamp
phk at FreeBSD.org
Wed Jan 24 12:36:05 UTC 2018
commit 717e8d50e6a2f23990376413a2e1ffb40aa40192
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Wed Jan 24 12:34:53 2018 +0000
Eliminate unused argument
diff --git a/lib/libvcc/vcc_action.c b/lib/libvcc/vcc_action.c
index ee6fe85..3126ef1 100644
--- a/lib/libvcc/vcc_action.c
+++ b/lib/libvcc/vcc_action.c
@@ -93,7 +93,7 @@ parse_set(struct vcc *tl)
vcc_NextToken(tl);
ExpectErr(tl, ID);
- sym = VCC_SymbolTok(tl, NULL, SYM_VAR, 0);
+ sym = VCC_SymbolTok(tl, SYM_VAR, 0);
ERRCHK(tl);
if (sym == NULL) {
VSB_printf(tl->sb, "Unknown variable ");
@@ -154,7 +154,7 @@ parse_unset(struct vcc *tl)
/* XXX: Wrong, should use VCC_Expr(HEADER) */
vcc_NextToken(tl);
ExpectErr(tl, ID);
- sym = VCC_SymbolTok(tl, NULL, SYM_VAR, 0);
+ sym = VCC_SymbolTok(tl, SYM_VAR, 0);
ERRCHK(tl);
if (sym == NULL) {
VSB_printf(tl->sb, "Unknown variable ");
@@ -268,7 +268,7 @@ parse_return_vcl(struct vcc *tl)
ExpectErr(tl, '(');
vcc_NextToken(tl);
ExpectErr(tl, ID);
- sym = VCC_SymbolTok(tl, NULL, SYM_VCL, 0);
+ sym = VCC_SymbolTok(tl, SYM_VCL, 0);
ERRCHK(tl);
if (sym == NULL) {
VSB_printf(tl->sb, "Not a VCL label:\n");
@@ -419,7 +419,7 @@ vcc_ParseAction(struct vcc *tl)
return (1);
}
}
- sym = VCC_SymbolTok(tl, NULL, SYM_NONE, 0);
+ sym = VCC_SymbolTok(tl, SYM_NONE, 0);
if (sym != NULL && sym->kind == SYM_FUNC) {
vcc_Expr_Call(tl, sym);
return (1);
diff --git a/lib/libvcc/vcc_backend.c b/lib/libvcc/vcc_backend.c
index 1655f92..8a6b8fd 100644
--- a/lib/libvcc/vcc_backend.c
+++ b/lib/libvcc/vcc_backend.c
@@ -389,7 +389,7 @@ vcc_ParseHostDef(struct vcc *tl, const struct token *t_be, const char *vgcname)
Fb(tl, 0, "\t.probe = %s,\n", p);
ERRCHK(tl);
} else if (vcc_IdIs(t_field, "probe") && tl->t->tok == ID) {
- pb = VCC_SymbolTok(tl, NULL, SYM_PROBE, 0);
+ pb = VCC_SymbolTok(tl, SYM_PROBE, 0);
if (pb == NULL) {
VSB_printf(tl->sb, "Probe %.*s not found\n",
PF(tl->t));
diff --git a/lib/libvcc/vcc_compile.h b/lib/libvcc/vcc_compile.h
index 8694c38..1ff5d1a 100644
--- a/lib/libvcc/vcc_compile.h
+++ b/lib/libvcc/vcc_compile.h
@@ -310,7 +310,7 @@ void vcc_stevedore(struct vcc *vcc, const char *stv_name);
void VCC_PrintCName(struct vsb *vsb, const char *b, const char *e);
struct symbol *VCC_Symbol(struct vcc *, struct symbol *,
const char *, const char *, enum symkind, int);
-struct symbol *VCC_SymbolTok(struct vcc *, struct symbol *, enum symkind, int);
+struct symbol *VCC_SymbolTok(struct vcc *, enum symkind, int);
const char * VCC_SymKind(struct vcc *tl, const struct symbol *s);
typedef void symwalk_f(struct vcc *tl, const struct symbol *s);
void VCC_WalkSymbols(struct vcc *tl, symwalk_f *func, enum symkind kind);
diff --git a/lib/libvcc/vcc_expr.c b/lib/libvcc/vcc_expr.c
index dacae1e..0919b7e 100644
--- a/lib/libvcc/vcc_expr.c
+++ b/lib/libvcc/vcc_expr.c
@@ -657,9 +657,9 @@ vcc_expr4(struct vcc *tl, struct expr **e, vcc_type_t fmt)
sym = NULL;
kind = VCC_HandleKind(fmt);
if (kind != SYM_NONE)
- sym = VCC_SymbolTok(tl, NULL, kind, 0);
+ sym = VCC_SymbolTok(tl, kind, 0);
if (sym == NULL)
- sym = VCC_SymbolTok(tl, NULL, SYM_NONE, 0);
+ sym = VCC_SymbolTok(tl, SYM_NONE, 0);
if (sym == NULL || sym->eval == NULL) {
VSB_printf(tl->sb, "Symbol not found: ");
vcc_ErrToken(tl, tl->t);
diff --git a/lib/libvcc/vcc_symb.c b/lib/libvcc/vcc_symb.c
index cb94ffb..ffb66fc 100644
--- a/lib/libvcc/vcc_symb.c
+++ b/lib/libvcc/vcc_symb.c
@@ -105,11 +105,10 @@ vcc_new_symbol(struct vcc *tl, const char *b, const char *e)
}
struct symbol *
-VCC_SymbolTok(struct vcc *tl, struct symbol *parent,
- enum symkind kind, int create)
+VCC_SymbolTok(struct vcc *tl, enum symkind kind, int create)
{
- return (VCC_Symbol(tl, parent, tl->t->b, tl->t->e, kind, create));
+ return (VCC_Symbol(tl, NULL, tl->t->b, tl->t->e, kind, create));
}
struct symbol *
@@ -245,7 +244,7 @@ VCC_HandleSymbol(struct vcc *tl, vcc_type_t fmt, const char *pfx)
kind = VCC_HandleKind(fmt);
assert(kind != SYM_NONE);
- sym = VCC_SymbolTok(tl, NULL, SYM_NONE, 0);
+ sym = VCC_SymbolTok(tl, 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",
@@ -270,7 +269,7 @@ VCC_HandleSymbol(struct vcc *tl, vcc_type_t fmt, const char *pfx)
return (sym);
}
if (sym == NULL)
- sym = VCC_SymbolTok(tl, NULL, kind, 1);
+ sym = VCC_SymbolTok(tl, kind, 1);
AN(sym);
AZ(sym->ndef);
VCC_GlobalSymbol(sym, fmt, pfx);
diff --git a/lib/libvcc/vcc_vmod.c b/lib/libvcc/vcc_vmod.c
index 79adcb6..96abdda 100644
--- a/lib/libvcc/vcc_vmod.c
+++ b/lib/libvcc/vcc_vmod.c
@@ -75,7 +75,7 @@ vcc_ParseImport(struct vcc *tl)
ExpectErr(tl, ID);
mod = tl->t;
- osym = VCC_SymbolTok(tl, NULL, SYM_NONE, 0);
+ osym = VCC_SymbolTok(tl, SYM_NONE, 0);
vcc_NextToken(tl);
if (osym != NULL && osym->kind != SYM_VMOD) {
@@ -288,7 +288,7 @@ vcc_ParseNew(struct vcc *tl)
vcc_NextToken(tl);
ExpectErr(tl, ID);
- sy2 = VCC_SymbolTok(tl, NULL, SYM_OBJECT, 0);
+ sy2 = VCC_SymbolTok(tl, SYM_OBJECT, 0);
if (sy2 == NULL || sy2->extra == NULL) {
if (sy2 == NULL)
p = "Symbol";
diff --git a/lib/libvcc/vcc_xref.c b/lib/libvcc/vcc_xref.c
index 1462145..d6d5535 100644
--- a/lib/libvcc/vcc_xref.c
+++ b/lib/libvcc/vcc_xref.c
@@ -65,7 +65,7 @@ vcc_AddRef(struct vcc *tl, enum symkind kind)
{
struct symbol *sym;
- sym = VCC_SymbolTok(tl, NULL, kind, 1);
+ sym = VCC_SymbolTok(tl, kind, 1);
if (sym->ref_b == NULL)
sym->ref_b = tl->t;
AN(sym);
@@ -78,7 +78,7 @@ vcc_AddDef(struct vcc *tl, enum symkind kind)
{
struct symbol *sym;
- sym = VCC_SymbolTok(tl, NULL, kind, 1);
+ sym = VCC_SymbolTok(tl, kind, 1);
if (sym->def_b == NULL)
sym->def_b = tl->t;
AN(sym);
@@ -144,7 +144,7 @@ vcc_AddCall(struct vcc *tl)
pc = TlAlloc(tl, sizeof *pc);
assert(pc != NULL);
- pc->sym = VCC_SymbolTok(tl, NULL, SYM_SUB, 1);
+ pc->sym = VCC_SymbolTok(tl, SYM_SUB, 1);
AN(pc->sym);
pc->t = tl->t;
VTAILQ_INSERT_TAIL(&tl->curproc->calls, pc, list);
More information about the varnish-commit
mailing list