From 46789bd14d5fc7448dbd1b68138a8b08964353bc Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 30 Nov 2014 13:03:10 +0000
Subject: safe lstr* replacements: mir_strlen, mir_wstrlen, mir_strcpy,
 mir_wstrcpy, mir_strncpy, mir_wstrncpy, mir_strcat, mir_wstrcat, mir_strncat,
 mir_wstrncat

git-svn-id: http://svn.miranda-ng.org/main/trunk@11171 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Clist_modern/src/hdr/modern_commonheaders.h |  1 -
 plugins/Clist_modern/src/modern_clcopts.cpp         |  2 +-
 plugins/Clist_modern/src/modern_gdiplus.cpp         |  1 -
 plugins/Clist_modern/src/modern_skinselector.cpp    | 16 ----------------
 plugins/Clist_modern/src/modern_utils.cpp           |  6 ------
 5 files changed, 1 insertion(+), 25 deletions(-)

(limited to 'plugins/Clist_modern')

diff --git a/plugins/Clist_modern/src/hdr/modern_commonheaders.h b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
index 006c5541b0..7447002bbd 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonheaders.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
@@ -144,7 +144,6 @@ extern TCHAR SkinsFolder[MAX_PATH];
 char* __cdecl strstri( char *a, const char *b);
 BOOL __cdecl mir_bool_strcmpi(const char *a, const char *b);
 int __cdecl mir_strcmp (const char *a, const char *b);
-int __cdecl mir_strlen (const char *a);
 int __cdecl mir_strcmpi(const char *a, const char *b);
 int __cdecl mir_tstrcmpi(const TCHAR *a, const TCHAR *b);
 BOOL __cdecl mir_bool_tstrcmpi(const TCHAR *a, const TCHAR *b);
diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp
index f09e5b17de..0c18063a46 100644
--- a/plugins/Clist_modern/src/modern_clcopts.cpp
+++ b/plugins/Clist_modern/src/modern_clcopts.cpp
@@ -1574,7 +1574,7 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 static INT_PTR BkgrCfg_Register(WPARAM wParam, LPARAM lParam)
 {
 	char *szSetting = (char*)wParam;
-	int len = strlen(szSetting) + 1;
+	size_t len = strlen(szSetting) + 1;
 
 	char *value = (char *)mir_alloc(len + 4); // add room for flags (DWORD)
 	memcpy(value, szSetting, len);
diff --git a/plugins/Clist_modern/src/modern_gdiplus.cpp b/plugins/Clist_modern/src/modern_gdiplus.cpp
index c406c9383e..3110ea362e 100644
--- a/plugins/Clist_modern/src/modern_gdiplus.cpp
+++ b/plugins/Clist_modern/src/modern_gdiplus.cpp
@@ -12,7 +12,6 @@
 
 using namespace Gdiplus;
 
-int mir_strlen(const char *a);
 HBITMAP ske_CreateDIB32(int cx, int cy);
 
 BYTE      saved_alpha;
diff --git a/plugins/Clist_modern/src/modern_skinselector.cpp b/plugins/Clist_modern/src/modern_skinselector.cpp
index ee7d62a203..804f7bab41 100644
--- a/plugins/Clist_modern/src/modern_skinselector.cpp
+++ b/plugins/Clist_modern/src/modern_skinselector.cpp
@@ -131,22 +131,6 @@ lph_top:	 //only 4 of 9 instructions in here don't use AL, so optimal pipe use i
 #endif
 }
 
-/*
-DWORD mod_CalcHash(const char * a)
-{
-    DWORD Val = 0;
-    BYTE N;
-    DWORD k = mir_strlen(a);
-    if (k < 23) N = (BYTE)k; else N = 23;
-    while (N>0)
-    {
-        Val = Val << 1;
-        Val ^= ((DWORD)*a++)-31;
-        N--;
-    }
-    return Val;
-}
-*/
 int AddModernMaskToList(MODERNMASK *mm,  LISTMODERNMASK * mmTemplateList)
 {
 	if (!mmTemplateList || !mm) return -1;
diff --git a/plugins/Clist_modern/src/modern_utils.cpp b/plugins/Clist_modern/src/modern_utils.cpp
index ff5825e67e..50856ca11f 100644
--- a/plugins/Clist_modern/src/modern_utils.cpp
+++ b/plugins/Clist_modern/src/modern_utils.cpp
@@ -60,12 +60,6 @@ int __cdecl mir_strcmp (const char *a, const char *b)
 	return (strcmp(a,b));
 };
 
-int mir_strlen (const char *a)
-{
-	if (a == NULL) return 0;
-	return (int)(strlen(a));
-};
-
 #define strlen(a) mir_strlen(a)
 #define strcmp(a,b) mir_strcmp(a,b)
 
-- 
cgit v1.2.3