From ca9e826e27ec51c2cff31545204bb462cdd9fb63 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Thu, 13 Nov 2014 20:02:40 +0000 Subject: not needed NULL checks git-svn-id: http://svn.miranda-ng.org/main/trunk@10984 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/options/headerbar.cpp | 2 -- src/modules/options/iconheader.cpp | 1 - src/modules/protocols/protoint.cpp | 6 ++---- 3 files changed, 2 insertions(+), 7 deletions(-) (limited to 'src/modules') diff --git a/src/modules/options/headerbar.cpp b/src/modules/options/headerbar.cpp index f3d19c8bdc..c643a4732d 100644 --- a/src/modules/options/headerbar.cpp +++ b/src/modules/options/headerbar.cpp @@ -290,8 +290,6 @@ static LRESULT CALLBACK MHeaderbarWndProc(HWND hwndDlg, UINT msg, WPARAM wParam switch(msg) { case WM_NCCREATE: itc = new MHeaderbarCtrl; //(MHeaderbarCtrl*)mir_alloc(sizeof(MHeaderbarCtrl)); - if (itc == NULL) - return FALSE; SetWindowLongPtr(hwndDlg, 0, (LONG_PTR)itc); MHeaderbar_SetupColors(itc); diff --git a/src/modules/options/iconheader.cpp b/src/modules/options/iconheader.cpp index d9d6f9deb6..2d58d47f16 100644 --- a/src/modules/options/iconheader.cpp +++ b/src/modules/options/iconheader.cpp @@ -323,7 +323,6 @@ static LRESULT CALLBACK MIcoTabWndProc(HWND hwndDlg, UINT msg, WPARAM wParam, L switch(msg) { case WM_NCCREATE: itc = new MIcoTabCtrl; //(MIcoTabCtrl*)mir_alloc(sizeof(MIcoTabCtrl)); - if (itc == NULL) return FALSE; itc->nSelectedIdx = -1; itc->nHotIdx = -1; itc->bMouseInside = FALSE; diff --git a/src/modules/protocols/protoint.cpp b/src/modules/protocols/protoint.cpp index e97f25c38d..bbe6a01e19 100644 --- a/src/modules/protocols/protoint.cpp +++ b/src/modules/protocols/protoint.cpp @@ -265,10 +265,8 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE PROTO_INTERFACE* AddDefaultAccount(const char* szProtoName) { PROTO_INTERFACE* ppi = new DEFAULT_PROTO_INTERFACE; - if (ppi != NULL) { - ppi->m_szModuleName = mir_strdup(szProtoName); - ppi->m_tszUserName = mir_a2t(szProtoName); - } + ppi->m_szModuleName = mir_strdup(szProtoName); + ppi->m_tszUserName = mir_a2t(szProtoName); return ppi; } -- cgit v1.2.3