MirandaG15:

- Minor fixes


git-svn-id: http://svn.miranda-ng.org/main/trunk@14068 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 4 insertions, 4 deletions

diff --git a/plugins/MirandaG15/src/LCDFramework/misc.cpp b/plugins/MirandaG15/src/LCDFramework/misc.cpp
index c553124893..d4a491f446 100644
--- a/plugins/MirandaG15/src/LCDFramework/misc.cpp
+++ b/plugins/MirandaG15/src/LCDFramework/misc.cpp
@@ -40,7 +40,7 @@ toWideString( const char* pStr , int len )
         return L"" ;

 

     //ASSERT_PTR( pStr ) ; 

-    ASSERT( len >= 0 || len == -1 , _T("Invalid string length: ") << len ) ; 

+    ASSERT( len >= 0 || len == -1); 

 

     // figure out how many wide characters we are going to get 

     int nChars = MultiByteToWideChar( CP_ACP , 0 , pStr , len , NULL , 0 ) ; 

@@ -65,7 +65,7 @@ string
 toNarrowString( const wchar_t* pStr , int len )

 {

     //ASSERT_PTR( pStr ) ; 

-    ASSERT( len >= 0 || len == -1 , _T("Invalid string length: ") << len ) ; 

+    ASSERT( len >= 0 || len == -1) ; 

 

     // figure out how many narrow characters we are going to get 

     int nChars = WideCharToMultiByte( CP_ACP , 0 , 

@@ -113,14 +113,14 @@ tstring Utf8_Decode(const char *str)
 {

 	tstring strRes = _T("");

 

-	int i, len;

+	int i;

 	char *p;

 	WCHAR *wszTemp = NULL;

 

 	if (str == NULL)

 		return strRes;

 

-	len = mir_strlen(str);

+	size_t len = mir_strlen(str);

 

     if ((wszTemp = (WCHAR *) malloc(sizeof(TCHAR) * (len + 2))) == NULL)

 		return strRes;