From 1023d868e4523c40c0f78a568c3e73b95d9b72ac Mon Sep 17 00:00:00 2001 From: psychon Date: Sun, 7 Nov 2010 16:12:17 +0000 Subject: [PATCH] Fix some warnings with -pedantic "invoking macro GLOBALMODULECALL argument 4: empty macro arguments are undefined in ISO C90 and ISO C++98" git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2177 726aef4b-f618-498e-8847-2d620e286838 --- Chan.cpp | 16 ++++++++-------- Client.cpp | 12 ++++++------ IRCSock.cpp | 18 +++++++++--------- Listener.cpp | 4 ++-- Modules.cpp | 2 +- User.cpp | 2 +- main.h | 2 ++ znc.cpp | 4 ++-- 8 files changed, 31 insertions(+), 29 deletions(-) diff --git a/Chan.cpp b/Chan.cpp index 5c0fe073..1d6740c8 100644 --- a/Chan.cpp +++ b/Chan.cpp @@ -63,7 +63,7 @@ bool CChan::WriteConfig(CFile& File) { if (!GetDefaultModes().empty()) m_pUser->PrintLine(File, "\tModes", GetDefaultModes()); - MODULECALL(OnWriteChanConfig(File, *this), m_pUser, NULL,); + MODULECALL(OnWriteChanConfig(File, *this), m_pUser, NULL, NOTHING); File.Write("\t\n"); return true; @@ -228,7 +228,7 @@ void CChan::ModeChange(const CString& sModes, const CString& sOpNick) { CNick* pOpNick = FindNick(sOpNick); if (pOpNick) { - MODULECALL(OnRawMode(*pOpNick, *this, sModeArg, sArgs), m_pUser, NULL, ); + MODULECALL(OnRawMode(*pOpNick, *this, sModeArg, sArgs), m_pUser, NULL, NOTHING); } for (unsigned int a = 0; a < sModeArg.size(); a++) { @@ -261,19 +261,19 @@ void CChan::ModeChange(const CString& sModes, const CString& sOpNick) { bool bNoChange = (pNick->HasPerm(uPerm) == bAdd); if (uMode && pOpNick) { - MODULECALL(OnChanPermission(*pOpNick, *pNick, *this, uMode, bAdd, bNoChange), m_pUser, NULL, ); + MODULECALL(OnChanPermission(*pOpNick, *pNick, *this, uMode, bAdd, bNoChange), m_pUser, NULL, NOTHING); if (uMode == CChan::M_Op) { if (bAdd) { - MODULECALL(OnOp(*pOpNick, *pNick, *this, bNoChange), m_pUser, NULL, ); + MODULECALL(OnOp(*pOpNick, *pNick, *this, bNoChange), m_pUser, NULL, NOTHING); } else { - MODULECALL(OnDeop(*pOpNick, *pNick, *this, bNoChange), m_pUser, NULL, ); + MODULECALL(OnDeop(*pOpNick, *pNick, *this, bNoChange), m_pUser, NULL, NOTHING); } } else if (uMode == CChan::M_Voice) { if (bAdd) { - MODULECALL(OnVoice(*pOpNick, *pNick, *this, bNoChange), m_pUser, NULL, ); + MODULECALL(OnVoice(*pOpNick, *pNick, *this, bNoChange), m_pUser, NULL, NOTHING); } else { - MODULECALL(OnDevoice(*pOpNick, *pNick, *this, bNoChange), m_pUser, NULL, ); + MODULECALL(OnDevoice(*pOpNick, *pNick, *this, bNoChange), m_pUser, NULL, NOTHING); } } } @@ -309,7 +309,7 @@ void CChan::ModeChange(const CString& sModes, const CString& sOpNick) { } else { bNoChange = !HasMode(uMode); } - MODULECALL(OnMode(*pOpNick, *this, uMode, sArg, bAdd, bNoChange), m_pUser, NULL, ); + MODULECALL(OnMode(*pOpNick, *this, uMode, sArg, bAdd, bNoChange), m_pUser, NULL, NOTHING); if (!bList) { (bAdd) ? AddMode(uMode, sArg) : RemMode(uMode); diff --git a/Client.cpp b/Client.cpp index bddaf04f..f9ef56e0 100644 --- a/Client.cpp +++ b/Client.cpp @@ -640,7 +640,7 @@ void CAuthBase::RefuseLogin(const CString& sReason) { "to login as you, but was rejected [" + sReason + "]."); } - GLOBALMODULECALL(OnFailedLogin(GetUsername(), GetRemoteIP()), NULL, NULL, ); + GLOBALMODULECALL(OnFailedLogin(GetUsername(), GetRemoteIP()), NULL, NULL, NOTHING); RefusedLogin(sReason); Invalidate(); } @@ -671,7 +671,7 @@ void CClient::AcceptLogin(CUser& User) { SendMotd(); - MODULECALL(OnClientLogin(), m_pUser, this, ); + MODULECALL(OnClientLogin(), m_pUser, this, NOTHING); } void CClient::Timeout() { @@ -692,7 +692,7 @@ void CClient::Disconnected() { m_pUser->UserDisconnected(this); } - MODULECALL(OnClientDisconnect(), m_pUser, this, ); + MODULECALL(OnClientDisconnect(), m_pUser, this, NOTHING); } void CClient::ReachedMaxBuffer() { @@ -785,7 +785,7 @@ void CClient::HandleCap(const CString& sLine) if (sSubCmd.Equals("LS")) { SCString ssOfferCaps; - GLOBALMODULECALL(OnClientCapLs(ssOfferCaps), m_pUser, this, ); + GLOBALMODULECALL(OnClientCapLs(ssOfferCaps), m_pUser, this, NOTHING); CString sRes; for (SCString::iterator i = ssOfferCaps.begin(); i != ssOfferCaps.end(); ++i) { sRes += *i + " "; @@ -827,7 +827,7 @@ void CClient::HandleCap(const CString& sLine) } else if ("userhost-in-names" == *it) { m_bUHNames = bVal; } - GLOBALMODULECALL(OnClientCapRequest(*it, bVal), m_pUser, this, ); + GLOBALMODULECALL(OnClientCapRequest(*it, bVal), m_pUser, this, NOTHING); if (bVal) { m_ssAcceptedCaps.insert(*it); @@ -849,7 +849,7 @@ void CClient::HandleCap(const CString& sLine) bool bRemoving = false; GLOBALMODULECALL(IsClientCapSupported(*i, false), m_pUser, this, bRemoving = true); if (bRemoving) { - GLOBALMODULECALL(OnClientCapRequest(*i, false), m_pUser, this, ); + GLOBALMODULECALL(OnClientCapRequest(*i, false), m_pUser, this, NOTHING); ssRemoved.insert(*i); } } diff --git a/IRCSock.cpp b/IRCSock.cpp index 2380c7d3..a9312697 100644 --- a/IRCSock.cpp +++ b/IRCSock.cpp @@ -143,7 +143,7 @@ void CIRCSock::ReadLine(const CString& sData) { SetNick(sNick); - MODULECALL(OnIRCConnected(), m_pUser, NULL, ); + MODULECALL(OnIRCConnected(), m_pUser, NULL, NOTHING); m_pUser->ClearRawBuffer(); m_pUser->AddRawBuffer(":" + sServer + " " + sCmd + " ", " " + sRest); @@ -381,7 +381,7 @@ void CIRCSock::ReadLine(const CString& sData) { SetNick(sNewNick); } - MODULECALL(OnNick(Nick, sNewNick, vFoundChans), m_pUser, NULL, ); + MODULECALL(OnNick(Nick, sNewNick, vFoundChans), m_pUser, NULL, NOTHING); if (!bIsVisible) { return; @@ -419,7 +419,7 @@ void CIRCSock::ReadLine(const CString& sData) { } } - MODULECALL(OnQuit(Nick, sMessage, vFoundChans), m_pUser, NULL, ); + MODULECALL(OnQuit(Nick, sMessage, vFoundChans), m_pUser, NULL, NOTHING); if (!bIsVisible) { return; @@ -449,7 +449,7 @@ void CIRCSock::ReadLine(const CString& sData) { if (pChan) { pChan->AddNick(Nick.GetNickMask()); - MODULECALL(OnJoin(Nick.GetNickMask(), *pChan), m_pUser, NULL, ); + MODULECALL(OnJoin(Nick.GetNickMask(), *pChan), m_pUser, NULL, NOTHING); if (pChan->IsDetached()) { return; @@ -465,7 +465,7 @@ void CIRCSock::ReadLine(const CString& sData) { bool bDetached = false; if (pChan) { pChan->RemNick(Nick.GetNick()); - MODULECALL(OnPart(Nick.GetNickMask(), *pChan), m_pUser, NULL, ); + MODULECALL(OnPart(Nick.GetNickMask(), *pChan), m_pUser, NULL, NOTHING); if (pChan->IsDetached()) bDetached = true; @@ -530,7 +530,7 @@ void CIRCSock::ReadLine(const CString& sData) { CChan* pChan = m_pUser->FindChan(sChan); if (pChan) { - MODULECALL(OnKick(Nick, sKickedNick, *pChan, sMsg), m_pUser, NULL, ); + MODULECALL(OnKick(Nick, sKickedNick, *pChan, sMsg), m_pUser, NULL, NOTHING); // do not remove the nick till after the OnKick call, so modules // can do Chan.FindNick or something to get more info. pChan->RemNick(sKickedNick); @@ -691,7 +691,7 @@ void CIRCSock::ReadLine(const CString& sData) { } } else if (sSubCmd == "ACK") { sArgs.Trim(); - MODULECALL(OnServerCapResult(sArgs, true), m_pUser, NULL, ); + MODULECALL(OnServerCapResult(sArgs, true), m_pUser, NULL, NOTHING); if ("multi-prefix" == sArgs) { m_bNamesx = true; } else if ("userhost-in-names" == sArgs) { @@ -702,7 +702,7 @@ void CIRCSock::ReadLine(const CString& sData) { // This should work because there's no [known] // capability with length of name more than 100 characters. sArgs.Trim(); - MODULECALL(OnServerCapResult(sArgs, false), m_pUser, NULL, ); + MODULECALL(OnServerCapResult(sArgs, false), m_pUser, NULL, NOTHING); } SendNextCap(); @@ -948,7 +948,7 @@ void CIRCSock::Connected() { } void CIRCSock::Disconnected() { - MODULECALL(OnIRCDisconnected(), m_pUser, NULL, ); + MODULECALL(OnIRCDisconnected(), m_pUser, NULL, NOTHING); DEBUG(GetSockName() << " == Disconnected()"); if (!m_pUser->IsBeingDeleted() && m_pUser->GetIRCConnectEnabled() && diff --git a/Listener.cpp b/Listener.cpp index 95ac4a62..cf2aaaa2 100644 --- a/Listener.cpp +++ b/Listener.cpp @@ -49,11 +49,11 @@ bool CRealListener::ConnectionFrom(const CString& sHost, unsigned short uPort) { Csock* CRealListener::GetSockObj(const CString& sHost, unsigned short uPort) { CIncomingConnection *pClient = new CIncomingConnection(sHost, uPort, m_pParent->GetAcceptType()); if (CZNC::Get().AllowConnectionFrom(sHost)) { - GLOBALMODULECALL(OnClientConnect(pClient, sHost, uPort), NULL, NULL, ); + GLOBALMODULECALL(OnClientConnect(pClient, sHost, uPort), NULL, NULL, NOTHING); } else { pClient->Write(":irc.znc.in 464 unknown-nick :Too many anonymous connections from your IP\r\n"); pClient->Close(Csock::CLT_AFTERWRITE); - GLOBALMODULECALL(OnFailedLogin("", sHost), NULL, NULL, ); + GLOBALMODULECALL(OnFailedLogin("", sHost), NULL, NULL, NOTHING); } return pClient; } diff --git a/Modules.cpp b/Modules.cpp index bdf85845..9a286f19 100644 --- a/Modules.cpp +++ b/Modules.cpp @@ -966,7 +966,7 @@ void CModules::GetAvailableMods(set& ssMods, bool bGlobal) { } } - GLOBALMODULECALL(OnGetAvailableMods(ssMods, bGlobal), NULL, NULL, ); + GLOBALMODULECALL(OnGetAvailableMods(ssMods, bGlobal), NULL, NULL, NOTHING); } bool CModules::FindModPath(const CString& sModule, CString& sModPath, diff --git a/User.cpp b/User.cpp index 25d6b4e9..92b5a72b 100644 --- a/User.cpp +++ b/User.cpp @@ -726,7 +726,7 @@ bool CUser::WriteConfig(CFile& File) { } } - MODULECALL(OnWriteUserConfig(File), this, NULL,); + MODULECALL(OnWriteUserConfig(File), this, NULL, NOTHING); File.Write("\n"); diff --git a/main.h b/main.h index 76f516dd..dc47b799 100644 --- a/main.h +++ b/main.h @@ -28,6 +28,8 @@ #define _DATADIR_ "/usr/share/znc" #endif +#define NOTHING (void)0 + #define ALLMODULECALL(macFUNC, macEXITER) \ do { \ CGlobalModules& GMods = CZNC::Get().GetModules(); \ diff --git a/znc.cpp b/znc.cpp index afd4beb2..44338a7f 100644 --- a/znc.cpp +++ b/znc.cpp @@ -989,7 +989,7 @@ bool CZNC::ParseConfig(const CString& sConfig) bool CZNC::RehashConfig(CString& sError) { - ALLMODULECALL(OnPreRehash(), ); + ALLMODULECALL(OnPreRehash(), NOTHING); // This clears m_msDelUsers HandleUserDeletion(); @@ -999,7 +999,7 @@ bool CZNC::RehashConfig(CString& sError) m_msUsers.clear(); if (DoRehash(sError)) { - ALLMODULECALL(OnPostRehash(), ); + ALLMODULECALL(OnPostRehash(), NOTHING); return true; }