From 13dd3996d5f1994262793e1669bf0600b1e4e840 Mon Sep 17 00:00:00 2001 From: psychon Date: Thu, 24 Jul 2008 10:14:41 +0000 Subject: [PATCH] Remove some unused arguments and unimplemented functions git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1146 726aef4b-f618-498e-8847-2d620e286838 --- Client.cpp | 2 +- FileUtils.h | 2 +- String.cpp | 4 ---- String.h | 1 - User.cpp | 2 +- User.h | 2 +- 6 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Client.cpp b/Client.cpp index 628bdf76..0aaca3ff 100644 --- a/Client.cpp +++ b/Client.cpp @@ -437,7 +437,7 @@ void CClient::ReadLine(const CString& sData) { // Need to lookup the connection by port, filter the port, and forward to the user if (strncasecmp(sTarget.c_str(), m_pUser->GetStatusPrefix().c_str(), m_pUser->GetStatusPrefix().length()) == 0) { - if ((m_pUser) && (m_pUser->ResumeFile(sTarget, uResumePort, uResumeSize))) { + if ((m_pUser) && (m_pUser->ResumeFile(uResumePort, uResumeSize))) { PutClient(":" + sTarget + "!znc@znc.com PRIVMSG " + GetNick() + " :\001DCC ACCEPT " + sFile + " " + CString(uResumePort) + " " + CString(uResumeSize) + "\001"); } else { PutStatus("DCC -> [" + GetNick() + "][" + sFile + "] Unable to find send to initiate resume."); diff --git a/FileUtils.h b/FileUtils.h index f90427d1..2bf5f881 100644 --- a/FileUtils.h +++ b/FileUtils.h @@ -246,7 +246,7 @@ public: return uRet; } - static unsigned int Delete(mode_t mode, const CString& sWildcard, const CString& sDir = ".") { + static unsigned int Delete(const CString& sWildcard, const CString& sDir = ".") { CDir cDir; cDir.FillByWildcard(sDir, sWildcard); return cDir.Delete(); diff --git a/String.cpp b/String.cpp index be8aa6de..83b12208 100644 --- a/String.cpp +++ b/String.cpp @@ -666,10 +666,6 @@ unsigned int CString::Split(const CString& sDelim, SCString& ssRet, bool bAllowE return ssRet.size(); } -CString CString::Format(const CString& sFormatStr, ...) { - return ""; -} - CString CString::RandomString(unsigned int uLength) { const char chars[] = "abcdefghijklmnopqrstuvwxyz" "ABCDEFGHIJKLMNOPQRSTUVWXYZ" diff --git a/String.h b/String.h index e5b98d6d..fca1c40e 100644 --- a/String.h +++ b/String.h @@ -107,7 +107,6 @@ public: unsigned int URLSplit(MCString& msRet) const; unsigned int Split(const CString& sDelim, VCString& vsRet, bool bAllowEmpty = true, const CString& sLeft = "", const CString& sRight = "") const; unsigned int Split(const CString& sDelim, SCString& ssRet, bool bAllowEmpty = true, const CString& sLeft = "", const CString& sRight = "") const; - static CString Format(const CString& sFormatStr, ...); static CString RandomString(unsigned int uLength); diff --git a/User.cpp b/User.cpp index ef8dadc7..90b80f01 100644 --- a/User.cpp +++ b/User.cpp @@ -914,7 +914,7 @@ bool CUser::PutModule(const CString& sModule, const CString& sLine, CClient* pCl return (pClient == NULL); } -bool CUser::ResumeFile(const CString& sRemoteNick, unsigned short uPort, unsigned long uFileSize) { +bool CUser::ResumeFile(unsigned short uPort, unsigned long uFileSize) { CSockManager& Manager = CZNC::Get().GetManager(); for (unsigned int a = 0; a < Manager.size(); a++) { diff --git a/User.h b/User.h index 32c14b75..7d4c3741 100644 --- a/User.h +++ b/User.h @@ -104,7 +104,7 @@ public: bool SendFile(const CString& sRemoteNick, const CString& sFileName, const CString& sModuleName = ""); bool GetFile(const CString& sRemoteNick, const CString& sRemoteIP, unsigned short uRemotePort, const CString& sFileName, unsigned long uFileSize, const CString& sModuleName = ""); - bool ResumeFile(const CString& sRemoteNick, unsigned short uPort, unsigned long uFileSize); + bool ResumeFile(unsigned short uPort, unsigned long uFileSize); CString GetCurNick() const; bool Clone(const CUser& User, CString& sErrorRet, bool bCloneChans = true); void BounceAllClients();