Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
69ca9b7b
Unverified
Commit
69ca9b7b
authored
Jul 26, 2022
by
Nils Goroll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reapply printf_nofmt.cocci
Manually replaced %% from printf format with %
parent
5d5653a8
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
24 additions
and
25 deletions
+24
-25
cache_panic.c
bin/varnishd/cache/cache_panic.c
+3
-3
common_vext.c
bin/varnishd/common/common_vext.c
+1
-1
vsb.c
lib/libvarnish/vsb.c
+2
-2
vsb_test.c
lib/libvarnish/vsb_test.c
+14
-14
vcc_acl.c
lib/libvcc/vcc_acl.c
+1
-1
vcc_expr.c
lib/libvcc/vcc_expr.c
+1
-2
vcc_source.c
lib/libvcc/vcc_source.c
+1
-1
vcc_utils.c
lib/libvcc/vcc_utils.c
+1
-1
No files found.
bin/varnishd/cache/cache_panic.c
View file @
69ca9b7b
...
...
@@ -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\n
PANIC REENTRANCY
\n\n
"
);
VSB_
cat
(
pan_vsb
,
"
\n\n
PANIC REENTRANCY
\n\n
"
);
abort
();
}
panicy
=
pthread_self
();
...
...
bin/varnishd/common/common_vext.c
View file @
69ca9b7b
...
...
@@ -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
);
...
...
lib/libvarnish/vsb.c
View file @
69ca9b7b
...
...
@@ -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'
:
...
...
lib/libvarnish/vsb_test.c
View file @
69ca9b7b
...
...
@@ -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
,
"
\n
Should have been:
\n\t
"
);
VSB_
cat
(
vsbo
,
"
\n
Should have been:
\n\t
"
);
VSB_quote
(
vsbo
,
tc
->
out
,
-
1
,
VSB_QUOTE_HEX
);
VSB_
printf
(
vsbo
,
"
\n
That's:
\n\t
"
);
VSB_
cat
(
vsbo
,
"
\n
That's:
\n\t
"
);
VSB_quote
(
vsbo
,
VSB_data
(
vsb
),
-
1
,
VSB_QUOTE_ESCHEX
);
VSB_
printf
(
vsbo
,
"
\n
vs:
\n\t
"
);
VSB_
cat
(
vsbo
,
"
\n
vs:
\n\t
"
);
VSB_quote
(
vsbo
,
tc
->
out
,
-
1
,
VSB_QUOTE_ESCHEX
);
VSB_printf
(
vsbo
,
"
\n
Flags 0x%02x = "
,
tc
->
how
);
if
(
!
tc
->
how
)
VSB_
printf
(
vsbo
,
"
\n\t
0"
);
VSB_
cat
(
vsbo
,
"
\n\t
0"
);
if
(
tc
->
how
&
VSB_QUOTE_NONL
)
VSB_
printf
(
vsbo
,
"
\n\t
VSB_QUOTE_NONL"
);
VSB_
cat
(
vsbo
,
"
\n\t
VSB_QUOTE_NONL"
);
if
(
tc
->
how
&
VSB_QUOTE_JSON
)
VSB_
printf
(
vsbo
,
"
\n\t
VSB_QUOTE_JSON"
);
VSB_
cat
(
vsbo
,
"
\n\t
VSB_QUOTE_JSON"
);
if
(
tc
->
how
&
VSB_QUOTE_HEX
)
VSB_
printf
(
vsbo
,
"
\n\t
VSB_QUOTE_HEX"
);
VSB_
cat
(
vsbo
,
"
\n\t
VSB_QUOTE_HEX"
);
if
(
tc
->
how
&
VSB_QUOTE_CSTR
)
VSB_
printf
(
vsbo
,
"
\n\t
VSB_QUOTE_CSTR"
);
VSB_
cat
(
vsbo
,
"
\n\t
VSB_QUOTE_CSTR"
);
if
(
tc
->
how
&
VSB_QUOTE_UNSAFE
)
VSB_
printf
(
vsbo
,
"
\n\t
VSB_QUOTE_UNSAFE"
);
VSB_
cat
(
vsbo
,
"
\n\t
VSB_QUOTE_UNSAFE"
);
if
(
tc
->
how
&
VSB_QUOTE_ESCHEX
)
VSB_
printf
(
vsbo
,
"
\n\t
VSB_QUOTE_ESCHEX"
);
VSB_
printf
(
vsbo
,
"
\n\n
"
);
VSB_
cat
(
vsbo
,
"
\n\t
VSB_QUOTE_ESCHEX"
);
VSB_
cat
(
vsbo
,
"
\n\n
"
);
err
=
1
;
}
AZ
(
VSB_finish
(
vsbo
));
...
...
lib/libvcc/vcc_acl.c
View file @
69ca9b7b
...
...
@@ -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
));
...
...
lib/libvcc/vcc_expr.c
View file @
69ca9b7b
...
...
@@ -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
;
}
...
...
lib/libvcc/vcc_source.c
View file @
69ca9b7b
...
...
@@ -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:
...
...
lib/libvcc/vcc_utils.c
View file @
69ca9b7b
...
...
@@ -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
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment