mir_tstrncpy <> _tcsncpy

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

1 files changed, 5 insertions, 5 deletions

diff --git a/plugins/YahooGroups/src/utils.cpp b/plugins/YahooGroups/src/utils.cpp
index e802f31473..f13cc4ee2d 100644
--- a/plugins/YahooGroups/src/utils.cpp
+++ b/plugins/YahooGroups/src/utils.cpp
@@ -117,7 +117,7 @@ void HexToBin(char *inData, ULONG &size, LPBYTE &outData)
 {

 	char buffer[32] = {0};

 	mir_strcpy(buffer, "0x");

-	mir_strncpy(buffer + 2, inData, HEX_SIZE);

+	strncpy(buffer + 2, inData, HEX_SIZE);

 	sscanf(buffer, "%x", &size);

 	outData = (unsigned char*)new char[size*2];

 	UINT i;

@@ -126,7 +126,7 @@ void HexToBin(char *inData, ULONG &size, LPBYTE &outData)
 	buffer[4] = '\0'; //mark the end of the string

 	for (i = 0; i < size; i++)

 		{

-			mir_strncpy(buffer + 2, &tmp[i * 2], 2);

+			strncpy(buffer + 2, &tmp[i * 2], 2);

 			sscanf(buffer, "%x", &outData[i]);

 		}

 	i = size;

@@ -143,7 +143,7 @@ int GetStringFromDatabase(MCONTACT hContact, char *szModule, char *szSettingName
 			res = 0;

 			int tmp = (int)mir_strlen(dbv.pszVal);

 			len = (tmp < size - 1) ? tmp : size - 1;

-			mir_strncpy(szResult, dbv.pszVal, len);

+			strncpy(szResult, dbv.pszVal, len);

 			szResult[len] = '\0';

 			mir_free(dbv.pszVal);

 		}

@@ -153,7 +153,7 @@ int GetStringFromDatabase(MCONTACT hContact, char *szModule, char *szSettingName
 				{

 					int tmp = (int)mir_strlen(szError);

 					len = (tmp < size - 1) ? tmp : size - 1;

-					mir_strncpy(szResult, szError, len);

+					strncpy(szResult, szError, len);

 					szResult[len] = '\0';

 				}

 				else{

@@ -327,7 +327,7 @@ MCONTACT GetContactFromID(TCHAR *szID, char *szProto)
 		szHandle = GetContactID(hContact, cProtocol);

 		

 		tmp = (TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR);

-		mir_tstrncpy(dispName, tmp, SIZEOF(dispName));

+		_tcsncpy(dispName, tmp, SIZEOF(dispName));

 		

 		if ((szHandle) && ((mir_tstrcmpi(szHandle, szID) == 0) || (mir_tstrcmpi(dispName, szID) == 0)) && ((szProto == NULL) || (_stricmp(szProto, cProtocol) == 0)))

 			found = 1;