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

Search'n'replace remaining NULL occurrences (#816)

Browse Source
This commit is contained in:
J-P Nurmi
2015-02-26 20:58:01 +01:00
parent 832cec45f8
commit 75b210e841
46 changed files with 237 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
modules/webadmin.cpp
View File

@@ -28,7 +28,7 @@ using std::map;
/* Stuff to be able to write this:
// i will be name of local variable, see below
// pUser can be NULL if only global modules are needed
// pUser can be nullptr if only global modules are needed
FOR_EACH_MODULE(i, pUser) {
// i is local variable of type CModules::iterator,
// so *i has type CModule*
@@ -173,7 +173,7 @@ public:
if (sUsername.empty()) {
WebSock.PrintErrorPage("Invalid Submission [Username is required]");
return NULL;
return nullptr;
}
if (pUser) {
@@ -185,7 +185,7 @@ public:
if (sArg != WebSock.GetParam("password2")) {
WebSock.PrintErrorPage("Invalid Submission [Passwords do not match]");
return NULL;
return nullptr;
}
CUser* pNewUser = new CUser(sUsername);
@@ -308,7 +308,7 @@ public:
pNewUser->SetMaxNetworks(pUser->MaxNetworks());
}
// If pUser is not NULL, we are editing an existing user.
// If pUser is not nullptr, we are editing an existing user.
// Users must not be able to change their own admin flag.
if (pUser != CZNC::Get().FindUser(WebSock.GetUser())) {
pNewUser->SetAdmin(WebSock.GetParam("isadmin").ToBool());
@@ -343,7 +343,7 @@ public:
CString sArgs = WebSock.GetParam("modargs_" + sModName);
try {
if (!pNewUser->GetModules().LoadModule(sModName, sArgs, CModInfo::UserModule, pNewUser, NULL, sModRet)) {
if (!pNewUser->GetModules().LoadModule(sModName, sArgs, CModInfo::UserModule, pNewUser, nullptr, sModRet)) {
sModLoadError = "Unable to load module [" + sModName + "] [" + sModRet + "]";
}
} catch (...) {
@@ -366,7 +366,7 @@ public:
CString sModLoadError;
try {
if (!pNewUser->GetModules().LoadModule(sModName, sArgs, CModInfo::UserModule, pNewUser, NULL, sModRet)) {
if (!pNewUser->GetModules().LoadModule(sModName, sArgs, CModInfo::UserModule, pNewUser, nullptr, sModRet)) {
sModLoadError = "Unable to load module [" + sModName + "] [" + sModRet + "]";
}
} catch (...) {
@@ -409,7 +409,7 @@ public:
CIRCNetwork* SafeGetNetworkFromParam(CWebSock& WebSock) {
CUser* pUser = CZNC::Get().FindUser(SafeGetUserNameParam(WebSock));
CIRCNetwork* pNetwork = NULL;
CIRCNetwork* pNetwork = nullptr;
if (pUser) {
pNetwork = pUser->FindNetwork(SafeGetNetworkParam(WebSock));
@@ -614,7 +614,7 @@ public:
return false;
}
bool ChanPage(CWebSock& WebSock, CTemplate& Tmpl, CIRCNetwork* pNetwork, CChan* pChan = NULL) {
bool ChanPage(CWebSock& WebSock, CTemplate& Tmpl, CIRCNetwork* pNetwork, CChan* pChan = nullptr) {
std::shared_ptr<CWebSession> spSession = WebSock.GetSession();
Tmpl.SetFile("add_edit_chan.tmpl");
CUser* pUser = pNetwork->GetUser();
@@ -760,7 +760,7 @@ public:
return true;
}
bool NetworkPage(CWebSock& WebSock, CTemplate& Tmpl, CUser* pUser, CIRCNetwork* pNetwork = NULL) {
bool NetworkPage(CWebSock& WebSock, CTemplate& Tmpl, CUser* pUser, CIRCNetwork* pNetwork = nullptr) {
std::shared_ptr<CWebSession> spSession = WebSock.GetSession();
Tmpl.SetFile("add_edit_network.tmpl");
@@ -789,11 +789,11 @@ public:
// Check if module is loaded globally
l["CanBeLoadedGlobally"] = CString(Info.SupportsType(CModInfo::GlobalModule));
l["LoadedGlobally"] = CString(CZNC::Get().GetModules().FindModule(Info.GetName()) != NULL);
l["LoadedGlobally"] = CString(CZNC::Get().GetModules().FindModule(Info.GetName()) != nullptr);
// Check if module is loaded by user
l["CanBeLoadedByUser"] = CString(Info.SupportsType(CModInfo::UserModule));
l["LoadedByUser"] = CString(pUser->GetModules().FindModule(Info.GetName()) != NULL);
l["LoadedByUser"] = CString(pUser->GetModules().FindModule(Info.GetName()) != nullptr);
if (!spSession->IsAdmin() && pUser->DenyLoadMod()) {
l["Disabled"] = "true";
@@ -1178,7 +1178,7 @@ public:
return false;
}
bool UserPage(CWebSock& WebSock, CTemplate& Tmpl, CUser* pUser = NULL) {
bool UserPage(CWebSock& WebSock, CTemplate& Tmpl, CUser* pUser = nullptr) {
std::shared_ptr<CWebSession> spSession = WebSock.GetSession();
Tmpl.SetFile("add_edit_user.tmpl");
@@ -1349,7 +1349,7 @@ public:
l["HasArgs"] = CString(Info.GetHasArgs());
l["ArgsHelpText"] = Info.GetArgsHelpText();
CModule *pModule = NULL;
CModule *pModule = nullptr;
if (pUser) {
pModule = pUser->GetModules().FindModule(Info.GetName());
// Check if module is loaded by all or some networks
@@ -1375,7 +1375,7 @@ public:
}
l["CanBeLoadedGlobally"] = CString(Info.SupportsType(CModInfo::GlobalModule));
// Check if module is loaded globally
l["LoadedGlobally"] = CString(CZNC::Get().GetModules().FindModule(Info.GetName()) != NULL);
l["LoadedGlobally"] = CString(CZNC::Get().GetModules().FindModule(Info.GetName()) != nullptr);
if (!spSession->IsAdmin() && pUser && pUser->DenyLoadMod()) {
l["Disabled"] = "true";
@@ -1442,7 +1442,7 @@ public:
return true;
}
/* If pUser is NULL, we are adding a user, else we are editing this one */
/* If pUser is nullptr, we are adding a user, else we are editing this one */
CString sUsername = WebSock.GetParam("user");
if (!pUser && CZNC::Get().FindUser(sUsername)) {
@@ -1867,11 +1867,11 @@ public:
CModule *pMod = CZNC::Get().GetModules().FindModule(sModName);
if (!pMod) {
if (!CZNC::Get().GetModules().LoadModule(sModName, sArgs, CModInfo::GlobalModule, NULL, NULL, sModRet)) {
if (!CZNC::Get().GetModules().LoadModule(sModName, sArgs, CModInfo::GlobalModule, nullptr, nullptr, sModRet)) {
sModLoadError = "Unable to load module [" + sModName + "] [" + sModRet + "]";
}
} else if (pMod->GetArgs() != sArgs) {
if (!CZNC::Get().GetModules().ReloadModule(sModName, sArgs, NULL, NULL, sModRet)) {
if (!CZNC::Get().GetModules().ReloadModule(sModName, sArgs, nullptr, nullptr, sModRet)) {
sModLoadError = "Unable to reload module [" + sModName + "] [" + sModRet + "]";
}
}