summaryrefslogtreecommitdiff
path: root/plugins/TabSRMM/src/chat/muchighlight.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-08-12 16:21:37 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-08-12 16:21:37 +0000
commit58ff50e5bf8dbb6b28d54370423232dc0221cd53 (patch)
treeb71113e7574217421cb622e584f643df490e708a /plugins/TabSRMM/src/chat/muchighlight.cpp
parentc2cb7db85cbd67c5b95c2735d9b917eb0ac1d234 (diff)
mir_alloc/calloc/free instead of simple malloc/calloc/free
git-svn-id: http://svn.miranda-ng.org/main/trunk@5660 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/TabSRMM/src/chat/muchighlight.cpp')
-rw-r--r--plugins/TabSRMM/src/chat/muchighlight.cpp17
1 files changed, 5 insertions, 12 deletions
diff --git a/plugins/TabSRMM/src/chat/muchighlight.cpp b/plugins/TabSRMM/src/chat/muchighlight.cpp
index 1777657801..e5d96b3ea4 100644
--- a/plugins/TabSRMM/src/chat/muchighlight.cpp
+++ b/plugins/TabSRMM/src/chat/muchighlight.cpp
@@ -34,18 +34,12 @@
void CMUCHighlight::cleanup()
{
- if (m_NickPatternString)
- mir_free(m_NickPatternString);
- if (m_TextPatternString)
- mir_free(m_TextPatternString);
-
+ mir_free(m_NickPatternString);
+ mir_free(m_TextPatternString);
m_TextPatternString = m_NickPatternString = 0;
- if (m_NickPatterns)
- mir_free(m_NickPatterns);
- if (m_TextPatterns)
- mir_free(m_TextPatterns);
-
+ mir_free(m_NickPatterns);
+ mir_free(m_TextPatterns);
m_iNickPatterns = m_iTextPatterns = 0;
m_NickPatterns = m_TextPatterns = 0;
}
@@ -194,8 +188,7 @@ skip_textpatterns:
::SendMessage(psi->dat->pContainer->hwndStatus, SB_SETTEXT, 0, (LPARAM)psi->dat->szStatusBar);
}
#endif
- if (tszMe)
- mir_free(tszMe);
+ mir_free(tszMe);
}
/*