git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "master" into "wdp".
[sliver-openvswitch.git]
/
lib
/
process.c
diff --git
a/lib/process.c
b/lib/process.c
index
a201a88
..
087275b
100644
(file)
--- a/
lib/process.c
+++ b/
lib/process.c
@@
-517,7
+517,7
@@
process_run_capture(char **argv, char **stdout_log, char **stderr_log,
block_sigchld(&oldsigs);
pid = fork();
if (pid < 0) {
block_sigchld(&oldsigs);
pid = fork();
if (pid < 0) {
-
int
error = errno;
+ error = errno;
unblock_sigchld(&oldsigs);
VLOG_WARN("fork failed: %s", strerror(error));
unblock_sigchld(&oldsigs);
VLOG_WARN("fork failed: %s", strerror(error));
@@
-590,7
+590,7
@@
sigchld_handler(int signr OVS_UNUSED)
struct process *p;
COVERAGE_INC(process_sigchld);
struct process *p;
COVERAGE_INC(process_sigchld);
- LIST_FOR_EACH (p,
struct process,
node, &all_processes) {
+ LIST_FOR_EACH (p, node, &all_processes) {
if (!p->exited) {
int retval, status;
do {
if (!p->exited) {
int retval, status;
do {