[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-397
From: |
Giuseppe Scrivano |
Subject: |
[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-397-ga56024a |
Date: |
Fri, 01 Oct 2010 11:22:33 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".
The branch, master has been updated
via a56024ad635582eccdd3361df37b3f51f8c9f706 (commit)
from f6ed0ddacbad5414391d86b8aec42576a339d813 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a56024ad635582eccdd3361df37b3f51f8c9f706
Author: Giuseppe Scrivano <address@hidden>
Date: Fri Oct 1 13:21:39 2010 +0200
Use waitpid from gnulib.
diff --git a/myserver/src/base/process/fork_server.cpp
b/myserver/src/base/process/fork_server.cpp
index 7468a33..28ffccb 100644
--- a/myserver/src/base/process/fork_server.cpp
+++ b/myserver/src/base/process/fork_server.cpp
@@ -335,9 +335,7 @@ int ForkServer::executeProcess (StartProcInfo *spi,
}
if (waitEnd)
- {
- return waitpid (*pid, NULL, 0);
- }
+ return gnulib::waitpid (*pid, NULL, 0);
return 0;
#endif
diff --git a/myserver/src/base/process/process.cpp
b/myserver/src/base/process/process.cpp
index 9c1b97a..2698c87 100644
--- a/myserver/src/base/process/process.cpp
+++ b/myserver/src/base/process/process.cpp
@@ -305,7 +305,7 @@ int Process::exec (StartProcInfo* spi, bool waitEnd)
}
if (waitEnd)
- return waitpid (pid, NULL, 0);
+ return gnulib::waitpid (pid, NULL, 0);
else
return pid;
@@ -391,7 +391,7 @@ int Process::isProcessAlive ()
int ret;
do
{
- ret = waitpid (pid, &status, WNOHANG);
+ ret = gnulib::waitpid (pid, &status, WNOHANG);
}
while (!ret && errno == EINTR);
if (!ret)
@@ -409,7 +409,7 @@ int Process::isProcessAlive ()
return 1;
/* Waitpid it to free the resource. */
- waitpid (pid, &status, WNOHANG | WUNTRACED);
+ gnulib::waitpid (pid, &status, WNOHANG | WUNTRACED);
return 0;
# endif
-----------------------------------------------------------------------
Summary of changes:
myserver/src/base/process/fork_server.cpp | 4 +---
myserver/src/base/process/process.cpp | 6 +++---
2 files changed, 4 insertions(+), 6 deletions(-)
hooks/post-receive
--
GNU MyServer
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-397-ga56024a,
Giuseppe Scrivano <=