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/FloatingContacts | |
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/FloatingContacts')
-rw-r--r-- | plugins/FloatingContacts/src/bitmap_funcs.cpp | 2 | ||||
-rw-r--r-- | plugins/FloatingContacts/src/filedrop.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/FloatingContacts/src/bitmap_funcs.cpp b/plugins/FloatingContacts/src/bitmap_funcs.cpp index c181841a13..98d21fa935 100644 --- a/plugins/FloatingContacts/src/bitmap_funcs.cpp +++ b/plugins/FloatingContacts/src/bitmap_funcs.cpp @@ -1042,7 +1042,7 @@ bool MyBitmap::loadFromFile(const char *fn, const char *fnAlpha) return loadFromFile_gradient(fn, fnAlpha);
char ext[5];
- memcpy(ext, fn + (strlen(fn) - 4), 5);
+ memcpy(ext, fn + (mir_strlen(fn) - 4), 5);
if (!mir_strcmpi(ext, ".png"))
return loadFromFile_png(fn, fnAlpha);
diff --git a/plugins/FloatingContacts/src/filedrop.cpp b/plugins/FloatingContacts/src/filedrop.cpp index 7a18009333..ff1cb937e9 100644 --- a/plugins/FloatingContacts/src/filedrop.cpp +++ b/plugins/FloatingContacts/src/filedrop.cpp @@ -225,7 +225,7 @@ static int CountFiles( char *szItem ) if ( NULL != strstr( szItem, "*.*" ))
{
- size_t offset = strlen( szDirName ) - 3;
+ size_t offset = mir_strlen( szDirName ) - 3;
mir_snprintf(szDirName + offset, SIZEOF( szDirName) - offset, "%s\0", fd.cFileName);
}
@@ -267,7 +267,7 @@ static void SaveFiles( char *szItem, char **ppFiles, int *pnCount ) if ( NULL != strstr( szItem, "*.*" ))
{
- size_t offset = strlen( szDirName ) - 3;
+ size_t offset = mir_strlen( szDirName ) - 3;
mir_snprintf(szDirName + offset, SIZEOF( szDirName) - offset, "%s\0", fd.cFileName);
}
@@ -281,14 +281,14 @@ static void SaveFiles( char *szItem, char **ppFiles, int *pnCount ) }
else
{
- size_t nSize = sizeof(char) * ( strlen( szItem ) + strlen( fd.cFileName ) + sizeof( char ));
+ size_t nSize = sizeof(char) * ( mir_strlen( szItem ) + mir_strlen( fd.cFileName ) + sizeof( char ));
char *szFile = (char*) malloc( nSize ) ;
strncpy( szFile, szItem, nSize - 1);
if ( NULL != strstr( szFile, "*.*" ))
{
- szFile[ strlen( szFile ) - 3 ] = '\0';
+ szFile[ mir_strlen( szFile ) - 3 ] = '\0';
strncat(szFile, fd.cFileName, nSize - mir_strlen(szFile));
}
|