Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnishevent3
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
uplex-varnish
varnishevent3
Commits
17523212
Commit
17523212
authored
May 17, 2011
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make struct storage fields used onlyr for SENDFILE_WORKS conditional.
Spotted by: sky
parent
8e58c809
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
0 deletions
+10
-0
cache.h
bin/varnishd/cache.h
+2
-0
storage_file.c
bin/varnishd/storage_file.c
+2
-0
storage_malloc.c
bin/varnishd/storage_malloc.c
+2
-0
storage_persistent.c
bin/varnishd/storage_persistent.c
+2
-0
storage_synth.c
bin/varnishd/storage_synth.c
+2
-0
No files found.
bin/varnishd/cache.h
View file @
17523212
...
...
@@ -382,8 +382,10 @@ struct storage {
unsigned
len
;
unsigned
space
;
#ifdef SENDFILE_WORKS
int
fd
;
off_t
where
;
#endif
};
/* Object core structure ---------------------------------------------
...
...
bin/varnishd/storage_file.c
View file @
17523212
...
...
@@ -487,8 +487,10 @@ smf_alloc(struct stevedore *st, size_t size)
smf
->
s
.
ptr
=
smf
->
ptr
;
smf
->
s
.
len
=
0
;
smf
->
s
.
stevedore
=
st
;
#ifdef SENDFILE_WORKS
smf
->
s
.
fd
=
smf
->
sc
->
fd
;
smf
->
s
.
where
=
smf
->
offset
;
#endif
return
(
&
smf
->
s
);
}
...
...
bin/varnishd/storage_malloc.c
View file @
17523212
...
...
@@ -95,7 +95,9 @@ sma_alloc(struct stevedore *st, size_t size)
}
sma
->
s
.
len
=
0
;
sma
->
s
.
space
=
size
;
#ifdef SENDFILE_WORKS
sma
->
s
.
fd
=
-
1
;
#endif
sma
->
s
.
stevedore
=
st
;
sma
->
s
.
magic
=
STORAGE_MAGIC
;
return
(
&
sma
->
s
);
...
...
bin/varnishd/storage_persistent.c
View file @
17523212
...
...
@@ -450,7 +450,9 @@ smp_allocx(struct stevedore *st, size_t min_size, size_t max_size,
ss
->
space
=
max_size
;
ss
->
priv
=
sc
;
ss
->
stevedore
=
st
;
#ifdef SENDFILE_WORKS
ss
->
fd
=
sc
->
fd
;
#endif
if
(
ssg
!=
NULL
)
*
ssg
=
sg
;
return
(
ss
);
...
...
bin/varnishd/storage_synth.c
View file @
17523212
...
...
@@ -91,7 +91,9 @@ SMS_Makesynth(struct object *obj)
sto
->
priv
=
vsb
;
sto
->
len
=
0
;
sto
->
space
=
0
;
#ifdef SENDFILE_WORKS
sto
->
fd
=
-
1
;
#endif
sto
->
stevedore
=
&
sms_stevedore
;
sto
->
magic
=
STORAGE_MAGIC
;
...
...
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