adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-06 08:52:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use nullptr (#816)

Browse Source 
Changes applied by 'clang-modernize -use-nullptr [...]'
This commit is contained in:
J-P Nurmi
2015-02-25 09:19:28 +01:00
parent 26cc16caa7
commit 70c0ffb10b
38 changed files with 246 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/FileUtils.cpp
+4 -4
View File
@@ -648,7 +648,7 @@ int CExecSock::popen2(int & iReadFD, int & iWriteFD, const CString & sCommand) {
"sh",
"-c",
sCommand.c_str(),
NULL
nullptr
};
execvp("sh", (char * const *) pArgv);
// if execvp returns, there was an error
@@ -668,9 +668,9 @@ int CExecSock::popen2(int & iReadFD, int & iWriteFD, const CString & sCommand) {
void CExecSock::close2(int iPid, int iReadFD, int iWriteFD) {
close(iReadFD);
close(iWriteFD);
time_t iNow = time(NULL);
while (waitpid(iPid, NULL, WNOHANG) == 0) {
if ((time(NULL) - iNow) > 5)
time_t iNow = time(nullptr);
while (waitpid(iPid, nullptr, WNOHANG) == 0) {
if ((time(nullptr) - iNow) > 5)
break; // giveup
usleep(100);
}