Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
unique-xids
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
unique-xids
Commits
4371f7bd
Commit
4371f7bd
authored
Sep 06, 2012
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Various code-polishings to make OmnitiOS happy.
Some of them are rather pedantic: "NULL" vs "(char*)0" -- Really ?
parent
060e6449
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
6 deletions
+6
-6
mgt_child.c
bin/varnishd/mgt/mgt_child.c
+1
-1
mgt_vcc.c
bin/varnishd/mgt/mgt_vcc.c
+1
-1
storage_persistent.c
bin/varnishd/storage/storage_persistent.c
+1
-1
storage_persistent_mgt.c
bin/varnishd/storage/storage_persistent_mgt.c
+1
-1
vtc_varnish.c
bin/varnishtest/vtc_varnish.c
+2
-2
No files found.
bin/varnishd/mgt/mgt_child.c
View file @
4371f7bd
...
...
@@ -476,7 +476,7 @@ mgt_sigchld(const struct vev *e, int what)
assert
(
r
==
child_pid
);
vsb
=
VSB_new_auto
();
XXXAN
(
vsb
);
VSB_printf
(
vsb
,
"Child (%
d) %s"
,
r
,
status
?
"died"
:
"ended"
);
VSB_printf
(
vsb
,
"Child (%
ld) %s"
,
(
long
)
r
,
status
?
"died"
:
"ended"
);
if
(
WIFEXITED
(
status
)
&&
WEXITSTATUS
(
status
))
{
VSB_printf
(
vsb
,
" status=%d"
,
WEXITSTATUS
(
status
));
exit_status
|=
0x20
;
...
...
bin/varnishd/mgt/mgt_vcc.c
View file @
4371f7bd
...
...
@@ -177,7 +177,7 @@ static void
run_cc
(
void
*
priv
)
{
mgt_sandbox
(
SANDBOX_CC
);
(
void
)
execl
(
"/bin/sh"
,
"/bin/sh"
,
"-c"
,
priv
,
NULL
);
(
void
)
execl
(
"/bin/sh"
,
"/bin/sh"
,
"-c"
,
priv
,
(
char
*
)
0
);
}
/*--------------------------------------------------------------------
...
...
bin/varnishd/storage/storage_persistent.c
View file @
4371f7bd
...
...
@@ -320,7 +320,7 @@ smp_open(const struct stevedore *st)
/* We trust the parent to give us a valid silo, for good measure: */
AZ
(
smp_valid_silo
(
sc
));
AZ
(
mprotect
(
sc
->
base
,
4096
,
PROT_READ
));
AZ
(
mprotect
(
(
void
*
)
sc
->
base
,
4096
,
PROT_READ
));
sc
->
ident
=
SIGN_DATA
(
&
sc
->
idn
);
...
...
bin/varnishd/storage/storage_persistent_mgt.c
View file @
4371f7bd
...
...
@@ -178,7 +178,7 @@ smp_mgt_init(struct stevedore *parent, int ac, char * const *av)
else
target
=
NULL
;
sc
->
base
=
mmap
(
target
,
sc
->
mediasize
,
PROT_READ
|
PROT_WRITE
,
sc
->
base
=
(
void
*
)
mmap
(
target
,
sc
->
mediasize
,
PROT_READ
|
PROT_WRITE
,
MAP_NOCORE
|
MAP_NOSYNC
|
MAP_SHARED
,
sc
->
fd
,
0
);
if
(
sc
->
base
==
MAP_FAILED
)
...
...
bin/varnishtest/vtc_varnish.c
View file @
4371f7bd
...
...
@@ -377,10 +377,10 @@ varnish_launch(struct varnish *v)
AZ
(
close
(
v
->
fds
[
3
]));
for
(
i
=
3
;
i
<
getdtablesize
();
i
++
)
(
void
)
close
(
i
);
AZ
(
execl
(
"/bin/sh"
,
"/bin/sh"
,
"-c"
,
VSB_data
(
vsb
),
NULL
));
AZ
(
execl
(
"/bin/sh"
,
"/bin/sh"
,
"-c"
,
VSB_data
(
vsb
),
(
char
*
)
0
));
exit
(
1
);
}
else
{
vtc_log
(
v
->
vl
,
3
,
"PID: %
d"
,
v
->
pid
);
vtc_log
(
v
->
vl
,
3
,
"PID: %
ld"
,
(
long
)
v
->
pid
);
}
AZ
(
close
(
v
->
fds
[
0
]));
AZ
(
close
(
v
->
fds
[
3
]));
...
...
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