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 /src/modules/database | |
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 'src/modules/database')
-rw-r--r-- | src/modules/database/dbini.cpp | 2 | ||||
-rw-r--r-- | src/modules/database/dbutils.cpp | 2 | ||||
-rw-r--r-- | src/modules/database/mdatabasecache.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/database/dbini.cpp b/src/modules/database/dbini.cpp index 4bd9c42f96..be17cf1416 100644 --- a/src/modules/database/dbini.cpp +++ b/src/modules/database/dbini.cpp @@ -211,7 +211,7 @@ static void ConvertBackslashes(char *str, UINT fileCp) case 'r': *pstr = '\r'; break;
default: *pstr = pstr[1]; break;
}
- memmove(pstr + 1, pstr + 2, strlen(pstr + 2) + 1);
+ memmove(pstr + 1, pstr + 2, mir_strlen(pstr + 2) + 1);
}
}
}
diff --git a/src/modules/database/dbutils.cpp b/src/modules/database/dbutils.cpp index b073fbcb49..425cc5d7b4 100644 --- a/src/modules/database/dbutils.cpp +++ b/src/modules/database/dbutils.cpp @@ -86,7 +86,7 @@ static INT_PTR DbEventTypeGet(WPARAM wParam, LPARAM lParam) static TCHAR* getEventString(DBEVENTINFO *dbei, LPSTR &buf)
{
LPSTR in = buf;
- buf += strlen(buf) + 1;
+ buf += mir_strlen(buf) + 1;
return (dbei->flags & DBEF_UTF) ? Utf8DecodeT(in) : mir_a2t(in);
}
diff --git a/src/modules/database/mdatabasecache.cpp b/src/modules/database/mdatabasecache.cpp index c864394261..f0638b147d 100644 --- a/src/modules/database/mdatabasecache.cpp +++ b/src/modules/database/mdatabasecache.cpp @@ -157,9 +157,9 @@ void MDatabaseCache::SetCachedVariant(DBVARIANT* s /* new */, DBVARIANT* d /* ca memcpy(d, s, sizeof(DBVARIANT));
if ((s->type == DBVT_UTF8 || s->type == DBVT_ASCIIZ) && s->pszVal != NULL) {
if (szSave != NULL)
- d->pszVal = (char*)HeapReAlloc(m_hCacheHeap, 0, szSave, strlen(s->pszVal) + 1);
+ d->pszVal = (char*)HeapReAlloc(m_hCacheHeap, 0, szSave, mir_strlen(s->pszVal) + 1);
else
- d->pszVal = (char*)HeapAlloc(m_hCacheHeap, 0, strlen(s->pszVal) + 1);
+ d->pszVal = (char*)HeapAlloc(m_hCacheHeap, 0, mir_strlen(s->pszVal) + 1);
strcpy(d->pszVal, s->pszVal);
}
else if (szSave != NULL)
|