[master] 69ca9b7be Reapply printf_nofmt.cocci
Nils Goroll
nils.goroll at uplex.de
Tue Jul 26 10:32:05 UTC 2022
commit 69ca9b7bea61ca418369d2611a6d5c54d1e7b398
Author: Nils Goroll <nils.goroll at uplex.de>
Date: Tue Jul 26 12:04:04 2022 +0200
Reapply printf_nofmt.cocci
Manually replaced %% from printf format with %
diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index 473c2f1aa..31b98c9c5 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -159,9 +159,9 @@ pan_htc(struct vsb *vsb, const struct http_conn *htc)
return;
if (htc->rfd != NULL)
VSB_printf(vsb, "fd = %d (@%p),\n", *htc->rfd, htc->rfd);
- VSB_printf(vsb, "doclose = ");
+ VSB_cat(vsb, "doclose = ");
pan_stream_close(vsb, htc->doclose);
- VSB_printf(vsb, "\n");
+ VSB_cat(vsb, "\n");
WS_Panic(vsb, htc->ws);
VSB_printf(vsb, "{rxbuf_b, rxbuf_e} = {%p, %p},\n",
htc->rxbuf_b, htc->rxbuf_e);
@@ -726,7 +726,7 @@ pan_ic(const char *func, const char *file, int line, const char *cond,
if (pthread_mutex_lock(&panicstr_mtx)) {
/* Reentrant panic */
- VSB_printf(pan_vsb,"\n\nPANIC REENTRANCY\n\n");
+ VSB_cat(pan_vsb, "\n\nPANIC REENTRANCY\n\n");
abort();
}
panicy = pthread_self();
diff --git a/bin/varnishd/common/common_vext.c b/bin/varnishd/common/common_vext.c
index 1c1e1ee38..fffd9a8d5 100644
--- a/bin/varnishd/common/common_vext.c
+++ b/bin/varnishd/common/common_vext.c
@@ -113,7 +113,7 @@ vext_copyin(struct vsb *vident)
u %= 26;
VSB_printf(vp->vsb, "%c", 'a' + (char)u);
}
- VSB_printf(vp->vsb, ".so");
+ VSB_cat(vp->vsb, ".so");
AZ(VSB_finish(vp->vsb));
fprintf(stderr, "ee2 %s\n", VSB_data(vp->vsb));
fdo = open(VSB_data(vp->vsb), O_WRONLY|O_CREAT|O_EXCL, 0700);
diff --git a/lib/libvarnish/vsb.c b/lib/libvarnish/vsb.c
index dd9210201..30d95a531 100644
--- a/lib/libvarnish/vsb.c
+++ b/lib/libvarnish/vsb.c
@@ -612,12 +612,12 @@ VSB_quote_pfx(struct vsb *s, const char *pfx, const void *v, int len, int how)
if (how & VSB_QUOTE_CSTR) {
VSB_printf(s, "\\n\"\n%s\"", pfx);
} else if (how & VSB_QUOTE_JSON) {
- VSB_printf(s, "\\n");
+ VSB_cat(s, "\\n");
} else if (how & VSB_QUOTE_NONL) {
VSB_putc(s, *q);
nl = 1;
} else {
- VSB_printf(s, "\\n");
+ VSB_cat(s, "\\n");
}
break;
case '\r':
diff --git a/lib/libvarnish/vsb_test.c b/lib/libvarnish/vsb_test.c
index 7ca3beec7..b41512343 100644
--- a/lib/libvarnish/vsb_test.c
+++ b/lib/libvarnish/vsb_test.c
@@ -135,34 +135,34 @@ main(int argc, char *argv[])
VSB_clear(vsbo);
VSB_printf(vsbo, "0x%02x: ", tc->how);
VSB_quote(vsbo, tc->in, tc->inlen, VSB_QUOTE_HEX);
- VSB_printf(vsbo, " -> ");
+ VSB_cat(vsbo, " -> ");
VSB_quote(vsbo, VSB_data(vsb), -1, VSB_QUOTE_HEX);
- VSB_printf(vsbo, " (");
+ VSB_cat(vsbo, " (");
VSB_quote(vsbo, tc->out, -1, VSB_QUOTE_ESCHEX);
- VSB_printf(vsbo, ")");
+ VSB_cat(vsbo, ")");
if (strcmp(VSB_data(vsb), tc->out)) {
- VSB_printf(vsbo, "\nShould have been:\n\t");
+ VSB_cat(vsbo, "\nShould have been:\n\t");
VSB_quote(vsbo, tc->out, -1, VSB_QUOTE_HEX);
- VSB_printf(vsbo, "\nThat's:\n\t");
+ VSB_cat(vsbo, "\nThat's:\n\t");
VSB_quote(vsbo, VSB_data(vsb), -1, VSB_QUOTE_ESCHEX);
- VSB_printf(vsbo, "\nvs:\n\t");
+ VSB_cat(vsbo, "\nvs:\n\t");
VSB_quote(vsbo, tc->out, -1, VSB_QUOTE_ESCHEX);
VSB_printf(vsbo, "\nFlags 0x%02x = ", tc->how);
if (!tc->how)
- VSB_printf(vsbo, "\n\t0");
+ VSB_cat(vsbo, "\n\t0");
if (tc->how & VSB_QUOTE_NONL)
- VSB_printf(vsbo, "\n\tVSB_QUOTE_NONL");
+ VSB_cat(vsbo, "\n\tVSB_QUOTE_NONL");
if (tc->how & VSB_QUOTE_JSON)
- VSB_printf(vsbo, "\n\tVSB_QUOTE_JSON");
+ VSB_cat(vsbo, "\n\tVSB_QUOTE_JSON");
if (tc->how & VSB_QUOTE_HEX)
- VSB_printf(vsbo, "\n\tVSB_QUOTE_HEX");
+ VSB_cat(vsbo, "\n\tVSB_QUOTE_HEX");
if (tc->how & VSB_QUOTE_CSTR)
- VSB_printf(vsbo, "\n\tVSB_QUOTE_CSTR");
+ VSB_cat(vsbo, "\n\tVSB_QUOTE_CSTR");
if (tc->how & VSB_QUOTE_UNSAFE)
- VSB_printf(vsbo, "\n\tVSB_QUOTE_UNSAFE");
+ VSB_cat(vsbo, "\n\tVSB_QUOTE_UNSAFE");
if (tc->how & VSB_QUOTE_ESCHEX)
- VSB_printf(vsbo, "\n\tVSB_QUOTE_ESCHEX");
- VSB_printf(vsbo, "\n\n");
+ VSB_cat(vsbo, "\n\tVSB_QUOTE_ESCHEX");
+ VSB_cat(vsbo, "\n\n");
err = 1;
}
AZ(VSB_finish(vsbo));
diff --git a/lib/libvcc/vcc_acl.c b/lib/libvcc/vcc_acl.c
index 4ee895157..4ccefea4f 100644
--- a/lib/libvcc/vcc_acl.c
+++ b/lib/libvcc/vcc_acl.c
@@ -544,7 +544,7 @@ vcc_acl_emit(struct vcc *tl, const struct symbol *sym)
func = VSB_new_auto();
AN(func);
- VSB_printf(func, "match_acl_");
+ VSB_cat(func, "match_acl_");
VCC_PrintCName(func, sym->name, NULL);
AZ(VSB_finish(func));
diff --git a/lib/libvcc/vcc_expr.c b/lib/libvcc/vcc_expr.c
index 677e36dbb..1d4eb6453 100644
--- a/lib/libvcc/vcc_expr.c
+++ b/lib/libvcc/vcc_expr.c
@@ -979,8 +979,7 @@ vcc_expr_mul(struct vcc *tl, struct expr **e, vcc_type_t fmt)
while (tl->t->tok == '*' || tl->t->tok == '/' || tl->t->tok == '%') {
if (tl->t->tok == '%' && ((*e)->fmt != INT)) {
- VSB_printf(tl->sb,
- "Operator %% only possible on INT.\n");
+ VSB_cat(tl->sb, "Operator % only possible on INT.\n");
vcc_ErrWhere(tl, tl->t);
return;
}
diff --git a/lib/libvcc/vcc_source.c b/lib/libvcc/vcc_source.c
index 57167b37e..a0a93cdc0 100644
--- a/lib/libvcc/vcc_source.c
+++ b/lib/libvcc/vcc_source.c
@@ -120,7 +120,7 @@ vcc_include_glob_file(struct vcc *tl, const struct source *src_sp,
}
break;
case GLOB_NOMATCH:
- VSB_printf(tl->sb, "glob pattern matched no files.\n");
+ VSB_cat(tl->sb, "glob pattern matched no files.\n");
tl->err = 1;
break;
default:
diff --git a/lib/libvcc/vcc_utils.c b/lib/libvcc/vcc_utils.c
index 7feb88cf9..9264200c1 100644
--- a/lib/libvcc/vcc_utils.c
+++ b/lib/libvcc/vcc_utils.c
@@ -321,7 +321,7 @@ vcc_UintVal(struct vcc *tl)
}
retval = (int64_t)round(tl->t->num);
if (retval < 0) {
- VSB_printf(tl->sb, "UINT cannot be negative\n");
+ VSB_cat(tl->sb, "UINT cannot be negative\n");
vcc_ErrWhere(tl, tl->t);
return (0);
}
More information about the varnish-commit
mailing list