diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2015-05-22 10:06:32 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2015-05-22 10:06:32 +0000 |
| commit | 5a17c9299e03bebf46169927abdeee34aaf8e854 (patch) | |
| tree | cbd13080f33ac0b6396b9d3b8ba31a3c98de59f8 /plugins/TabSRMM/src | |
| parent | ed64312924e77707e7e5b5965c301692519f293a (diff) | |
replace strlen to mir_strlen
git-svn-id: http://svn.miranda-ng.org/main/trunk@13747 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/TabSRMM/src')
| -rw-r--r-- | plugins/TabSRMM/src/contactcache.cpp | 2 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/hotkeyhandler.cpp | 2 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/msgdialog.cpp | 4 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/utils.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/plugins/TabSRMM/src/contactcache.cpp b/plugins/TabSRMM/src/contactcache.cpp index 99f52c3f17..12c2b064dd 100644 --- a/plugins/TabSRMM/src/contactcache.cpp +++ b/plugins/TabSRMM/src/contactcache.cpp @@ -289,7 +289,7 @@ void CContactCache::saveHistory(WPARAM wParam, LPARAM) szFromStream = ::Message_GetFromStream(GetDlgItem(m_hwnd, IDC_MESSAGE), SF_RTFNOOBJS | SFF_PLAINRTF | SF_NCRFORNONASCII); if (szFromStream != NULL) { - iLength = iStreamLength = (strlen(szFromStream) + 1); + iLength = iStreamLength = (mir_strlen(szFromStream) + 1); if (iLength > 0 && m_history != NULL) { // XXX: iLength > 1 ? if ((m_iHistoryTop == m_iHistorySize) && oldTop == 0) { // shift the stack down... diff --git a/plugins/TabSRMM/src/hotkeyhandler.cpp b/plugins/TabSRMM/src/hotkeyhandler.cpp index ba31f8a055..ddd0fe2350 100644 --- a/plugins/TabSRMM/src/hotkeyhandler.cpp +++ b/plugins/TabSRMM/src/hotkeyhandler.cpp @@ -165,7 +165,7 @@ LONG_PTR CALLBACK HotkeyHandlerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP {
CLISTEVENT *cli = (CLISTEVENT *)CallService(MS_CLIST_GETEVENT, (WPARAM)INVALID_HANDLE_VALUE, 0);
if (cli != NULL) {
- if (strncmp(cli->pszService, "SRMsg/TypingMessage", strlen(cli->pszService))) {
+ if (strncmp(cli->pszService, "SRMsg/TypingMessage", mir_strlen(cli->pszService))) {
CallService(cli->pszService, 0, (LPARAM)cli);
break;
}
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index 81ae18d9a8..d4c9949748 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -2668,7 +2668,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP int flags = 0;
char *utfResult = mir_utf8encodeT(decoded);
- size_t memRequired = strlen(utfResult) + 1;
+ size_t memRequired = mir_strlen(utfResult) + 1;
// try to detect RTL
HWND hwndEdit = GetDlgItem(hwndDlg, IDC_MESSAGE);
@@ -2780,7 +2780,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP TCHAR *szText = (TCHAR*)mir_alloc((dbei.cbBlob + 1) * sizeof(TCHAR)); //URLs are made one char bigger for crlf
dbei.pBlob = (BYTE*)szText;
db_event_get(hDBEvent, &dbei);
- int iSize = int(strlen((char*)dbei.pBlob)) + 1;
+ int iSize = int(mir_strlen((char*)dbei.pBlob)) + 1;
bool bNeedsFree = false;
TCHAR *szConverted;
diff --git a/plugins/TabSRMM/src/utils.h b/plugins/TabSRMM/src/utils.h index 7dabdf9235..3815595ffa 100644 --- a/plugins/TabSRMM/src/utils.h +++ b/plugins/TabSRMM/src/utils.h @@ -99,7 +99,7 @@ public: static void AddToFileList(TCHAR ***pppFiles, int *totalCount, LPCTSTR szFilename);
//////////////////////////////////////////////////////////////////////////////////////
- // safe strlen function - do not overflow the given buffer length
+ // safe mir_strlen function - do not overflow the given buffer length
// if the buffer does not contain a valid (zero-terminated) string, it
// will return 0.
//
|