[master] 008e2eaf6 re-apply tools/coccinelle/printf_nofmt.cocci
Nils Goroll
nils.goroll at uplex.de
Tue Feb 9 16:15:10 UTC 2021
commit 008e2eaf6d097d2482a2de304c296363888b4303
Author: Nils Goroll <nils.goroll at uplex.de>
Date: Tue Feb 9 17:01:47 2021 +0100
re-apply tools/coccinelle/printf_nofmt.cocci
diff --git a/bin/varnishd/cache/cache_conn_pool.c b/bin/varnishd/cache/cache_conn_pool.c
index 21fcab862..c8d39e21d 100644
--- a/bin/varnishd/cache/cache_conn_pool.c
+++ b/bin/varnishd/cache/cache_conn_pool.c
@@ -558,9 +558,9 @@ VCP_Panic(struct vsb *vsb, struct conn_pool *cp)
if (PAN_dump_struct(vsb, cp, CONN_POOL_MAGIC, "conn_pool"))
return;
- VSB_printf(vsb, "ident = ");
+ VSB_cat(vsb, "ident = ");
VSB_quote(vsb, cp->ident, VSHA256_DIGEST_LENGTH, VSB_QUOTE_HEX);
- VSB_printf(vsb, ",\n");
+ VSB_cat(vsb, ",\n");
vcp_panic_endpoint(vsb, cp->endpoint);
VSB_indent(vsb, -2);
VSB_cat(vsb, "},\n");
diff --git a/bin/varnishd/cache/cache_director.c b/bin/varnishd/cache/cache_director.c
index 595265f55..c6fd40d96 100644
--- a/bin/varnishd/cache/cache_director.c
+++ b/bin/varnishd/cache/cache_director.c
@@ -354,7 +354,7 @@ do_list(struct cli *cli, struct director *d, void *priv)
if (la->p && d->vdir->methods->list != NULL)
d->vdir->methods->list(ctx, d, la->vsb, la->p, 0);
- VSB_printf(la->vsb, "\n");
+ VSB_cat(la->vsb, "\n");
AZ(VCL_Rel_CliCtx(&ctx));
AZ(ctx);
diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index 8331d5f23..63f605a05 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -122,7 +122,7 @@ PAN_dump_struct2(struct vsb *vsb, int block, const void *ptr,
VSB_vprintf(vsb, fmt, ap);
va_end(ap);
if (ptr == NULL) {
- VSB_printf(vsb, " = NULL\n");
+ VSB_cat(vsb, " = NULL\n");
return (-1);
}
VSB_printf(vsb, " = %p {", ptr);
@@ -145,7 +145,7 @@ PAN_dump_struct2(struct vsb *vsb, int block, const void *ptr,
VSB_printf(vsb, " EXPECTED: %s=0x%08x", smagic, magic);
if (block)
VSB_putc(vsb, '\n');
- VSB_printf(vsb, "}\n");
+ VSB_cat(vsb, "}\n");
return (-3);
}
if (block)
@@ -692,7 +692,7 @@ pan_argv(struct vsb *vsb)
{
int i;
- VSB_printf(pan_vsb, "argv = {\n");
+ VSB_cat(pan_vsb, "argv = {\n");
VSB_indent(vsb, 2);
for (i = 0; i < heritage.argc; i++) {
VSB_printf(vsb, "[%d] = ", i);
diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index 7cc42b0cd..1bab08f36 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -245,7 +245,7 @@ pan_pool(struct vsb *vsb)
{
struct pool *pp;
- VSB_printf(vsb, "pools = {\n");
+ VSB_cat(vsb, "pools = {\n");
VSB_indent(vsb, 2);
VTAILQ_FOREACH(pp, &pools, list) {
if (PAN_dump_struct(vsb, pp, POOL_MAGIC, "pool"))
@@ -254,10 +254,10 @@ pan_pool(struct vsb *vsb)
VSB_printf(vsb, "nthr = %u,\n", pp->nthr);
VSB_printf(vsb, "lqueue = %u\n", pp->lqueue);
VSB_indent(vsb, -2);
- VSB_printf(vsb, "},\n");
+ VSB_cat(vsb, "},\n");
}
VSB_indent(vsb, -2);
- VSB_printf(vsb, "},\n");
+ VSB_cat(vsb, "},\n");
}
/*--------------------------------------------------------------------*/
diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index abc41de2c..2ecbc8c3c 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -783,7 +783,7 @@ vcl_cli_list(struct cli *cli, const char * const *av, void *priv)
VSB_printf(vsb, "\t<-\t(%d label%s)",
vcl->nlabels, vcl->nlabels > 1 ? "s" : "");
}
- VSB_printf(vsb, "\n");
+ VSB_cat(vsb, "\n");
}
VCLI_VTE(cli, &vsb, 80);
}
diff --git a/bin/varnishd/cache/cache_vrt_priv.c b/bin/varnishd/cache/cache_vrt_priv.c
index 02ba46bdd..99c67c7dc 100644
--- a/bin/varnishd/cache/cache_vrt_priv.c
+++ b/bin/varnishd/cache/cache_vrt_priv.c
@@ -65,7 +65,7 @@ pan_privs(struct vsb *vsb, const struct vrt_privs *privs)
const struct vmod_priv_methods *m;
if (privs == NULL) {
- VSB_printf(vsb, "privs = NULL\n");
+ VSB_cat(vsb, "privs = NULL\n");
return;
}
VSB_printf(vsb, "privs = %p {\n", privs);
diff --git a/bin/varnishd/mgt/mgt_vcl.c b/bin/varnishd/mgt/mgt_vcl.c
index f4f7f7f23..3e978661b 100644
--- a/bin/varnishd/mgt/mgt_vcl.c
+++ b/bin/varnishd/mgt/mgt_vcl.c
@@ -841,7 +841,7 @@ mcf_vcl_list(struct cli *cli, const char * const *av, void *priv)
VSB_printf(vsb, "\t<-\t(%d label%s)",
vp->nto, vp->nto > 1 ? "s" : "");
}
- VSB_printf(vsb, "\n");
+ VSB_cat(vsb, "\n");
}
VCLI_VTE(cli, &vsb, 80);
}
diff --git a/lib/libvcc/vcc_acl.c b/lib/libvcc/vcc_acl.c
index 35573eb3f..b8e5d90d5 100644
--- a/lib/libvcc/vcc_acl.c
+++ b/lib/libvcc/vcc_acl.c
@@ -138,7 +138,7 @@ vcc_acl_chk(struct vcc *tl, const struct acl_e *ae, const int l,
AN(sa);
VTCP_name(sa, h, sizeof h, NULL, 0);
bprintf(t, "%s/%d", h, ae->mask);
- VSB_printf(tl->sb, "Address/Netmask mismatch, ");
+ VSB_cat(tl->sb, "Address/Netmask mismatch, ");
if (tl->acl_pedantic != 0)
VSB_printf(tl->sb, "need be %s\n", t);
else
diff --git a/lib/libvcc/vcc_action.c b/lib/libvcc/vcc_action.c
index 160aa9acb..95c565d87 100644
--- a/lib/libvcc/vcc_action.c
+++ b/lib/libvcc/vcc_action.c
@@ -168,7 +168,7 @@ vcc_act_unset(struct vcc *tl, struct token *t, struct symbol *sym)
AN(sym);
if (sym->u_methods == 0) {
vcc_ErrWhere2(tl, t, tl->t);
- VSB_printf(tl->sb, "Variable cannot be unset.\n");
+ VSB_cat(tl->sb, "Variable cannot be unset.\n");
return;
}
vcc_AddUses(tl, t, tl->t, sym, XREF_UNSET);
@@ -341,7 +341,7 @@ vcc_act_return(struct vcc *tl, struct token *t, struct symbol *sym)
}
#include "tbl/vcl_returns.h"
if (h == NULL) {
- VSB_printf(tl->sb, "Expected return action name.\n");
+ VSB_cat(tl->sb, "Expected return action name.\n");
vcc_ErrWhere(tl, tl->t);
ERRCHK(tl);
}
@@ -360,12 +360,12 @@ vcc_act_return(struct vcc *tl, struct token *t, struct symbol *sym)
else if (hand == VCL_RET_FAIL)
vcc_act_return_fail(tl);
else {
- VSB_printf(tl->sb, "Arguments not allowed.\n");
+ VSB_cat(tl->sb, "Arguments not allowed.\n");
vcc_ErrWhere(tl, tl->t);
}
} else {
if (hand == VCL_RET_SYNTH || hand == VCL_RET_VCL) {
- VSB_printf(tl->sb, "Missing argument.\n");
+ VSB_cat(tl->sb, "Missing argument.\n");
vcc_ErrWhere(tl, tl->t);
}
}
diff --git a/lib/libvcc/vcc_backend.c b/lib/libvcc/vcc_backend.c
index d61e973d9..e776f794c 100644
--- a/lib/libvcc/vcc_backend.c
+++ b/lib/libvcc/vcc_backend.c
@@ -83,7 +83,7 @@ Emit_Sockaddr(struct vcc *tl, struct vsb *vsb1, const struct token *t_host,
"\t.ipv6 = (const struct suckaddr *)%s,\n",
ipv6);
}
- VSB_printf(vsb1, "\t.uds_path = (void *) 0,\n");
+ VSB_cat(vsb1, "\t.uds_path = (void *) 0,\n");
}
/*
@@ -122,8 +122,8 @@ Emit_UDS_Path(struct vcc *tl, struct vsb *vsb1,
return;
}
VSB_printf(vsb1, "\t.uds_path = \"%s\",\n", t_path->dec);
- VSB_printf(vsb1, "\t.ipv4 = (void *) 0,\n");
- VSB_printf(vsb1, "\t.ipv6 = (void *) 0,\n");
+ VSB_cat(vsb1, "\t.ipv4 = (void *) 0,\n");
+ VSB_cat(vsb1, "\t.ipv6 = (void *) 0,\n");
}
/*--------------------------------------------------------------------
@@ -530,7 +530,7 @@ vcc_ParseHostDef(struct vcc *tl, const struct token *t_be, const char *vgcname)
VSB_printf(vsb1,
"\nstatic const struct vrt_endpoint vgc_dir_ep_%s = {\n",
vgcname);
- VSB_printf(vsb1, "\t.magic = VRT_ENDPOINT_MAGIC,\n");
+ VSB_cat(vsb1, "\t.magic = VRT_ENDPOINT_MAGIC,\n");
assert(t_host != NULL || t_path != NULL);
if (t_host != NULL)
@@ -544,7 +544,7 @@ vcc_ParseHostDef(struct vcc *tl, const struct token *t_be, const char *vgcname)
if (t_preamble != NULL)
VSB_printf(vsb1, "\t.preamble = %s,\n", t_preamble->dec);
- VSB_printf(vsb1, "};\n");
+ VSB_cat(vsb1, "};\n");
AZ(VSB_finish(vsb1));
Fh(tl, 0, "%s", VSB_data(vsb1));
VSB_destroy(&vsb1);
diff --git a/lib/libvcc/vcc_expr.c b/lib/libvcc/vcc_expr.c
index f44a868ab..c15203caf 100644
--- a/lib/libvcc/vcc_expr.c
+++ b/lib/libvcc/vcc_expr.c
@@ -1433,7 +1433,7 @@ vcc_Act_Call(struct vcc *tl, struct token *t, struct symbol *sym)
SkipToken(tl, ';');
VSB_cat(tl->fb, ";\n");
} else if (t != tl->t) {
- VSB_printf(tl->sb, "While compiling function call:\n\n");
+ VSB_cat(tl->sb, "While compiling function call:\n\n");
vcc_ErrWhere2(tl, t, tl->t);
}
vcc_delete_expr(e);
@@ -1518,8 +1518,7 @@ vcc_Eval_Default(struct vcc *tl, struct expr **e, struct token *t,
else if (fmt == BACKEND)
*e = vcc_mk_expr(BACKEND, "*(VCL_conf.default_director)");
else {
- VSB_printf(tl->sb,
- "Symbol 'default' is a reserved word.\n");
+ VSB_cat(tl->sb, "Symbol 'default' is a reserved word.\n");
vcc_ErrWhere(tl, t);
}
}
diff --git a/lib/libvcc/vcc_xref.c b/lib/libvcc/vcc_xref.c
index 83dec7461..105f45698 100644
--- a/lib/libvcc/vcc_xref.c
+++ b/lib/libvcc/vcc_xref.c
@@ -275,7 +275,7 @@ vcc_illegal_write(struct vcc *tl, struct procuse *pu, const struct method *m)
if (pu->sym->r_methods == 0) {
vcc_ErrWhere2(tl, pu->t1, pu->t2);
- VSB_printf(tl->sb, "Variable cannot be set.\n");
+ VSB_cat(tl->sb, "Variable cannot be set.\n");
return (NULL);
}
@@ -285,7 +285,7 @@ vcc_illegal_write(struct vcc *tl, struct procuse *pu, const struct method *m)
}
vcc_ErrWhere2(tl, pu->t1, pu->t2);
- VSB_printf(tl->sb, "Variable is read only.\n");
+ VSB_cat(tl->sb, "Variable is read only.\n");
return (NULL);
}
More information about the varnish-commit
mailing list