iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some cleanup to CFile

Browse Source 
Remove CFile::SetFD() which was unused and made FD leaks way too easy.

Remove CFile::CFile(int fd, const CString& sLongName) since it's unused and
it was the only reason we needed the m_bClose member which is now also gone.

Call ClearBuffer() in Close() in case someone reuses CFile instances.

Thanks to Sebastinas.



git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1383 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2009-02-17 15:29:06 +00:00
parent 77e4ce400f
commit 70b60aa451
2 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
FileUtils.cpp
View File

@@ -22,27 +22,16 @@
CFile::CFile() {
m_iFD = -1;
m_bClose = false;
}
CFile::CFile(const CString& sLongName) {
m_iFD = -1;
m_bClose = false;
SetFileName(sLongName);
}
CFile::CFile(int iFD, const CString& sLongName) {
m_iFD = iFD;
m_bClose = false;
SetFileName(sLongName);
}
CFile::~CFile() {
if (m_bClose && m_iFD != -1) {
Close();
}
Close();
}
void CFile::SetFileName(const CString& sLongName) {
@@ -286,7 +275,6 @@ bool CFile::Open(int iFlags, mode_t iMode) {
/* Make sure this FD isn't given to childs */
SetFdCloseOnExec(m_iFD);
m_bClose = true;
return true;
}
@@ -384,11 +372,11 @@ int CFile::Write(const CString & sData) {
return Write(sData.data(), sData.size());
}
void CFile::Close() {
if (m_iFD >= 0 && m_bClose) {
if (m_iFD >= 0) {
close(m_iFD);
m_iFD = -1;
m_bClose = false;
}
m_iFD = -1;
ClearBuffer();
}
void CFile::ClearBuffer() { m_sBuffer.clear(); }
@@ -430,8 +418,6 @@ CString CFile::GetDir() const {
return sDir;
}
void CFile::SetFD(int iFD) { m_iFD = iFD; }
CString CDir::ChangeDir(const CString& sPath, const CString& sAdd, const CString& sHomeDir) {
if (sAdd == "~") {
return sHomeDir;