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

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
+11 -11
View File
@@ -35,8 +35,8 @@ public:
"<format>");
AddCommand("Show", static_cast<CModCommand::ModCmdFunc>(&CIdentFileModule::Show));
m_pISpoofLockFile = NULL;
m_pIRCSock = NULL;
m_pISpoofLockFile = nullptr;
m_pIRCSock = nullptr;
}
virtual ~CIdentFileModule() {
@@ -94,14 +94,14 @@ public:
}
bool WriteISpoof() {
if (m_pISpoofLockFile != NULL) {
if (m_pISpoofLockFile != nullptr) {
return false;
}
m_pISpoofLockFile = new CFile;
if (!m_pISpoofLockFile->TryExLock(GetNV("File"), O_RDWR | O_CREAT)) {
delete m_pISpoofLockFile;
m_pISpoofLockFile = NULL;
m_pISpoofLockFile = nullptr;
return false;
}
@@ -112,7 +112,7 @@ public:
if (!m_pISpoofLockFile->Seek(0) || !m_pISpoofLockFile->Truncate()) {
delete m_pISpoofLockFile;
m_pISpoofLockFile = NULL;
m_pISpoofLockFile = nullptr;
return false;
}
@@ -135,21 +135,21 @@ public:
DEBUG("Releasing ident spoof for user/network [" + (m_pIRCSock ? m_pIRCSock->GetNetwork()->GetUser()->GetUserName() + "/" +
m_pIRCSock->GetNetwork()->GetName() : "<no user/network>") + "]");
SetIRCSock(NULL);
SetIRCSock(nullptr);
if (m_pISpoofLockFile != NULL) {
if (m_pISpoofLockFile != nullptr) {
if (m_pISpoofLockFile->Seek(0) && m_pISpoofLockFile->Truncate()) {
m_pISpoofLockFile->Write(m_sOrigISpoof);
}
delete m_pISpoofLockFile;
m_pISpoofLockFile = NULL;
m_pISpoofLockFile = nullptr;
}
}
bool OnLoad(const CString& sArgs, CString& sMessage) override {
m_pISpoofLockFile = NULL;
m_pIRCSock = NULL;
m_pISpoofLockFile = nullptr;
m_pIRCSock = nullptr;
if (GetNV("Format").empty()) {
SetNV("Format", "global { reply \"%ident%\" }");
@@ -163,7 +163,7 @@ public:
}
EModRet OnIRCConnecting(CIRCSock *pIRCSock) override {
if (m_pISpoofLockFile != NULL) {
if (m_pISpoofLockFile != nullptr) {
DEBUG("Aborting connection, ident spoof lock file exists");
PutModule("Aborting connection, another user or network is currently connecting and using the ident spoof file");
return HALTCORE;