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

Fix some warnings with -pedantic

Browse Source 
"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
This commit is contained in:
psychon
2010-11-07 16:12:17 +00:00
parent 16be1817d5
commit 1023d868e4
8 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Chan.cpp
+8 -8
View File
@@ -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</Chan>\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);
Client.cpp
+6 -6
View File
@@ -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);
}
}
IRCSock.cpp
+9 -9
View File
@@ -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() &&
Listener.cpp
+2 -2
View File
@@ -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;
}
Modules.cpp
+1 -1
View File
@@ -966,7 +966,7 @@ void CModules::GetAvailableMods(set<CModInfo>& ssMods, bool bGlobal) {
}
}
GLOBALMODULECALL(OnGetAvailableMods(ssMods, bGlobal), NULL, NULL, );
GLOBALMODULECALL(OnGetAvailableMods(ssMods, bGlobal), NULL, NULL, NOTHING);
}
bool CModules::FindModPath(const CString& sModule, CString& sModPath,
User.cpp
+1 -1
View File
@@ -726,7 +726,7 @@ bool CUser::WriteConfig(CFile& File) {
}
}
MODULECALL(OnWriteUserConfig(File), this, NULL,);
MODULECALL(OnWriteUserConfig(File), this, NULL, NOTHING);
File.Write("</User>\n");
main.h
+2
View File
@@ -28,6 +28,8 @@
#define _DATADIR_ "/usr/share/znc"
#endif
#define NOTHING (void)0
#define ALLMODULECALL(macFUNC, macEXITER) \
do { \
CGlobalModules& GMods = CZNC::Get().GetModules(); \
znc.cpp
+2 -2
View File
@@ -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;
}