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
403c05c1
Commit
403c05c1
authored
Dec 13, 2022
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clarify the difference between `objiterator` and `objiterate` in function names.
parent
26dfe252
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
cache_deliver_proc.c
bin/varnishd/cache/cache_deliver_proc.c
+2
-2
cache_fetch.c
bin/varnishd/cache/cache_fetch.c
+2
-2
No files found.
bin/varnishd/cache/cache_deliver_proc.c
View file @
403c05c1
...
@@ -215,7 +215,7 @@ VDP_Close(struct vdp_ctx *vdc)
...
@@ -215,7 +215,7 @@ VDP_Close(struct vdp_ctx *vdc)
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
static
int
v_matchproto_
(
objiterate_f
)
static
int
v_matchproto_
(
objiterate_f
)
vdp_objiterat
or
(
void
*
priv
,
unsigned
flush
,
const
void
*
ptr
,
ssize_t
len
)
vdp_objiterat
e
(
void
*
priv
,
unsigned
flush
,
const
void
*
ptr
,
ssize_t
len
)
{
{
enum
vdp_action
act
;
enum
vdp_action
act
;
...
@@ -241,7 +241,7 @@ VDP_DeliverObj(struct vdp_ctx *vdc, struct objcore *oc)
...
@@ -241,7 +241,7 @@ VDP_DeliverObj(struct vdp_ctx *vdc, struct objcore *oc)
AN
(
vdc
->
vsl
);
AN
(
vdc
->
vsl
);
vdc
->
req
=
NULL
;
vdc
->
req
=
NULL
;
final
=
oc
->
flags
&
(
OC_F_PRIVATE
|
OC_F_HFM
|
OC_F_HFP
)
?
1
:
0
;
final
=
oc
->
flags
&
(
OC_F_PRIVATE
|
OC_F_HFM
|
OC_F_HFP
)
?
1
:
0
;
r
=
ObjIterate
(
vdc
->
wrk
,
oc
,
vdc
,
vdp_objiterat
or
,
final
);
r
=
ObjIterate
(
vdc
->
wrk
,
oc
,
vdc
,
vdp_objiterat
e
,
final
);
if
(
r
<
0
)
if
(
r
<
0
)
return
(
r
);
return
(
r
);
return
(
0
);
return
(
0
);
...
...
bin/varnishd/cache/cache_fetch.c
View file @
403c05c1
...
@@ -764,7 +764,7 @@ vbf_stp_fetchend(struct worker *wrk, struct busyobj *bo)
...
@@ -764,7 +764,7 @@ vbf_stp_fetchend(struct worker *wrk, struct busyobj *bo)
*/
*/
static
int
v_matchproto_
(
objiterate_f
)
static
int
v_matchproto_
(
objiterate_f
)
vbf_objiterat
or
(
void
*
priv
,
unsigned
flush
,
const
void
*
ptr
,
ssize_t
len
)
vbf_objiterat
e
(
void
*
priv
,
unsigned
flush
,
const
void
*
ptr
,
ssize_t
len
)
{
{
struct
busyobj
*
bo
;
struct
busyobj
*
bo
;
ssize_t
l
;
ssize_t
l
;
...
@@ -852,7 +852,7 @@ vbf_stp_condfetch(struct worker *wrk, struct busyobj *bo)
...
@@ -852,7 +852,7 @@ vbf_stp_condfetch(struct worker *wrk, struct busyobj *bo)
ObjSetState
(
wrk
,
oc
,
BOS_STREAM
);
ObjSetState
(
wrk
,
oc
,
BOS_STREAM
);
}
}
if
(
ObjIterate
(
wrk
,
stale_oc
,
bo
,
vbf_objiterat
or
,
0
))
if
(
ObjIterate
(
wrk
,
stale_oc
,
bo
,
vbf_objiterat
e
,
0
))
(
void
)
VFP_Error
(
bo
->
vfc
,
"Template object failed"
);
(
void
)
VFP_Error
(
bo
->
vfc
,
"Template object failed"
);
if
(
bo
->
vfc
->
failed
)
{
if
(
bo
->
vfc
->
failed
)
{
...
...
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