mir_tstrncpy <> _tcsncpy

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

3 files changed, 11 insertions, 11 deletions

diff --git a/protocols/Sametime/src/options.cpp b/protocols/Sametime/src/options.cpp
index b1a15f850a..f9a2ee775f 100644
--- a/protocols/Sametime/src/options.cpp
+++ b/protocols/Sametime/src/options.cpp
@@ -363,15 +363,15 @@ void CSametimeProto::LoadOptions()
 	DBVARIANT dbv;

 

 	if (!db_get_utf(0, m_szModuleName, "ServerName", &dbv)) {

-		mir_strncpy(options.server_name, dbv.pszVal, LSTRINGLEN);

+		strncpy(options.server_name, dbv.pszVal, LSTRINGLEN);

 		db_free(&dbv);

 	}

 	if (!db_get_utf(0, m_szModuleName, "stid", &dbv)) {

-		mir_strncpy(options.id, dbv.pszVal, LSTRINGLEN);

+		strncpy(options.id, dbv.pszVal, LSTRINGLEN);

 		db_free(&dbv);

 	}

 	if (!db_get_utf(0, m_szModuleName, "Password", &dbv)) {

-		mir_strncpy(options.pword, dbv.pszVal, LSTRINGLEN);

+		strncpy(options.pword, dbv.pszVal, LSTRINGLEN);

 		db_free(&dbv);

 	}

 

diff --git a/protocols/Sametime/src/sametime.cpp b/protocols/Sametime/src/sametime.cpp
index 627b9a7d56..708be8481f 100644
--- a/protocols/Sametime/src/sametime.cpp
+++ b/protocols/Sametime/src/sametime.cpp
@@ -44,7 +44,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_PROTOCO
 */

 INT_PTR CSametimeProto::GetName(WPARAM wParam, LPARAM lParam)

 {

-	mir_strncpy((char*)lParam, m_szModuleName, wParam);

+	strncpy((char*)lParam, m_szModuleName, wParam);

 	return 0;

 }

 

diff --git a/protocols/Sametime/src/userlist.cpp b/protocols/Sametime/src/userlist.cpp
index aeb7b69156..debe054ec3 100644
--- a/protocols/Sametime/src/userlist.cpp
+++ b/protocols/Sametime/src/userlist.cpp
@@ -673,10 +673,10 @@ void mwResolve_handler_callback(mwServiceResolve* srvc, guint32 id, guint32 code
 	if (advanced == TRUE) {

 		// send column names

 		mcsr.psr.cbSize = 0;

-		mir_tstrncpy(mcsr.pszFields[0], TranslateT("ID"), 512);

-		mir_tstrncpy(mcsr.pszFields[1], TranslateT("Name"), 512);

-		mir_tstrncpy(mcsr.pszFields[2], TranslateT("Description"), 512);

-		mir_tstrncpy(mcsr.pszFields[3], TranslateT("Group?"), 512);

+		_tcsncpy(mcsr.pszFields[0], TranslateT("ID"), 512);

+		_tcsncpy(mcsr.pszFields[1], TranslateT("Name"), 512);

+		_tcsncpy(mcsr.pszFields[2], TranslateT("Description"), 512);

+		_tcsncpy(mcsr.pszFields[3], TranslateT("Group?"), 512);

 		proto->ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_SEARCHRESULT, (HANDLE)id, (LPARAM)&mcsr);

 	}

 

@@ -687,11 +687,11 @@ void mwResolve_handler_callback(mwServiceResolve* srvc, guint32 id, guint32 code
 		for (; ri; ri = ri->next) {

 			mri = ((mwResolveResult *)ri->data)->matches;

 			for (; mri; mri = mri->next) {

-				mir_strncpy(mcsr.psr.stid, ((mwResolveMatch *)mri->data)->id, 256);

+				strncpy(mcsr.psr.stid, ((mwResolveMatch *)mri->data)->id, 256);

 				mcsr.psr.stid[255] = 0;

 				MultiByteToWideChar(CP_UTF8, 0, mcsr.psr.stid, -1, mcsr.pszFields[0], 512);

 

-				mir_strncpy(mcsr.psr.name, ((mwResolveMatch *)mri->data)->name, 256);

+				strncpy(mcsr.psr.name, ((mwResolveMatch *)mri->data)->name, 256);

 				mcsr.psr.name[255] = 0;

 				MultiByteToWideChar(CP_UTF8, 0, mcsr.psr.name, -1, mcsr.pszFields[1], 512);

 

@@ -702,7 +702,7 @@ void mwResolve_handler_callback(mwServiceResolve* srvc, guint32 id, guint32 code
 

 				mcsr.psr.group = (((mwResolveMatch *)mri->data)->type == mwResolveMatch_GROUP);

 				//MultiByteToWideChar(CP_UTF8, 0, mcsr.psr.name, -1, mcsr.pszFields[1], 512);

-				mir_tstrncpy(mcsr.pszFields[3], mcsr.psr.group ? TranslateT("True") : TranslateT("False"), 512);

+				_tcsncpy(mcsr.pszFields[3], mcsr.psr.group ? TranslateT("True") : TranslateT("False"), 512);

 

 				if (advanced == TRUE)

 					proto->ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_SEARCHRESULT, (HANDLE)id, (LPARAM)&mcsr);