mir_tstrncpy <> _tcsncpy

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

9 files changed, 29 insertions, 29 deletions

diff --git a/protocols/Gadu-Gadu/src/core.cpp b/protocols/Gadu-Gadu/src/core.cpp
index 6d4bfcb17d..2bf2907cf4 100644
--- a/protocols/Gadu-Gadu/src/core.cpp
+++ b/protocols/Gadu-Gadu/src/core.cpp
@@ -207,7 +207,7 @@ int gg_decodehosts(char *var, GGHOST *hosts, int max)
 

 			// Insert new item

 			hosts[hp].hostname[127] = 0;

-			mir_strncpy(hosts[hp].hostname, hostname, 127);

+			strncpy(hosts[hp].hostname, hostname, 127);

 			hosts[hp].port = portname ? atoi(portname) : 443;

 			hp ++;

 

diff --git a/protocols/Gadu-Gadu/src/dynstuff.cpp b/protocols/Gadu-Gadu/src/dynstuff.cpp
index e84273f6a3..4d21ed7eb0 100644
--- a/protocols/Gadu-Gadu/src/dynstuff.cpp
+++ b/protocols/Gadu-Gadu/src/dynstuff.cpp
@@ -247,7 +247,7 @@ int string_append_n(string_t s, const char *str, int count)
 	string_realloc(s, s->len + count);

 

 	s->str[s->len + count] = 0;

-	mir_strncpy(s->str + s->len, str, count);

+	strncpy(s->str + s->len, str, count);

 

 	s->len += count;

 

@@ -480,7 +480,7 @@ char **array_make(const char *string, const char *sep, int max, int trim, int qu
 		} else {

 			for (q = p, len = 0; *q && (last || !strchr(sep, *q)); q++, len++);

 			token = (char*)calloc(1, len + 1);

-			mir_strncpy(token, p, len);

+			strncpy(token, p, len);

 			token[len] = 0;

 			p = q;

 		}

diff --git a/protocols/Gadu-Gadu/src/filetransfer.cpp b/protocols/Gadu-Gadu/src/filetransfer.cpp
index bfa4e99c50..3d23d0a9a5 100644
--- a/protocols/Gadu-Gadu/src/filetransfer.cpp
+++ b/protocols/Gadu-Gadu/src/filetransfer.cpp
@@ -269,7 +269,7 @@ void __cdecl GGPROTO::dccmainthread(void*)
 							{

 								PROTOFILETRANSFERSTATUS pfts;

 								local_dcc->tick = tick;

-								mir_strncpy(filename, local_dcc->folder, sizeof(filename));

+								strncpy(filename, local_dcc->folder, sizeof(filename));

 								mir_strncat(filename, (char*)local_dcc->file_info.filename, sizeof(filename) - mir_strlen(filename));

 								memset(&pfts, 0, sizeof(PROTOFILETRANSFERSTATUS));

 								pfts.cbSize = sizeof(PROTOFILETRANSFERSTATUS);

@@ -300,7 +300,7 @@ void __cdecl GGPROTO::dccmainthread(void*)
 							if (local_dcc->file_fd != -1)

 							{

 								PROTOFILETRANSFERSTATUS pfts;

-								mir_strncpy(filename, local_dcc->folder, sizeof(filename));

+								strncpy(filename, local_dcc->folder, sizeof(filename));

 								mir_strncat(filename, (char*)local_dcc->file_info.filename, sizeof(filename) - mir_strlen(filename));

 								memset(&pfts, 0, sizeof(PROTOFILETRANSFERSTATUS));

 								pfts.cbSize = sizeof(PROTOFILETRANSFERSTATUS);

@@ -499,7 +499,7 @@ void __cdecl GGPROTO::dccmainthread(void*)
 							{

 								PROTOFILETRANSFERSTATUS pfts;

 								local_dcc7->tick = tick;

-								mir_strncpy(filename, local_dcc7->folder, sizeof(filename));

+								strncpy(filename, local_dcc7->folder, sizeof(filename));

 								mir_strncat(filename, (char*)local_dcc7->filename, sizeof(filename) - mir_strlen(filename));

 								memset(&pfts, 0, sizeof(PROTOFILETRANSFERSTATUS));

 								pfts.cbSize = sizeof(PROTOFILETRANSFERSTATUS);

@@ -530,7 +530,7 @@ void __cdecl GGPROTO::dccmainthread(void*)
 							if (local_dcc7->file_fd != -1)

 							{

 								PROTOFILETRANSFERSTATUS pfts;

-								mir_strncpy(filename, local_dcc7->folder, sizeof(filename));

+								strncpy(filename, local_dcc7->folder, sizeof(filename));

 								mir_strncat(filename, (char*)local_dcc7->filename, sizeof(filename) - mir_strlen(filename));

 								memset(&pfts, 0, sizeof(PROTOFILETRANSFERSTATUS));

 								pfts.cbSize = sizeof(PROTOFILETRANSFERSTATUS);

@@ -666,7 +666,7 @@ HANDLE GGPROTO::dccfileallow(HANDLE hTransfer, const PROTOCHAR* szPath)
 {

 	struct gg_dcc *dcc = (struct gg_dcc *) hTransfer;

 	char fileName[MAX_PATH], *path = mir_t2a(szPath);

-	mir_strncpy(fileName, path, sizeof(fileName));

+	strncpy(fileName, path, sizeof(fileName));

 	mir_strncat(fileName, (char*)dcc->file_info.filename, sizeof(fileName) - mir_strlen(fileName));

 	dcc->folder = _strdup((char *) path);

 	dcc->tick = 0;

@@ -708,7 +708,7 @@ HANDLE GGPROTO::dcc7fileallow(HANDLE hTransfer, const PROTOCHAR* szPath)
 	struct gg_dcc7 *dcc7 = (struct gg_dcc7 *) hTransfer;

 	char fileName[MAX_PATH], *path = mir_t2a(szPath);

 	int iFtRemoveRes;

-	mir_strncpy(fileName, path, sizeof(fileName));

+	strncpy(fileName, path, sizeof(fileName));

 	mir_strncat(fileName, (char*)dcc7->filename, sizeof(fileName) - mir_strlen(fileName));

 	dcc7->folder = _strdup((char *) path);

 	dcc7->tick = 0;

diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp
index 7196ed4b3c..45fd51745f 100644
--- a/protocols/Gadu-Gadu/src/gg.cpp
+++ b/protocols/Gadu-Gadu/src/gg.cpp
@@ -436,7 +436,7 @@ void gg_debughandler(int level, const char *format, va_list ap)
    char *nl = strrchr(szFormat, '\n');

    if (nl) *nl = 0;

 

-   mir_strncpy(szText + PREFIXLEN, "[libgadu] \0", sizeof(szText) - PREFIXLEN);

+   strncpy(szText + PREFIXLEN, "[libgadu] \0", sizeof(szText) - PREFIXLEN);

 

    char prefix[6];

    mir_snprintf(prefix, SIZEOF(prefix), "%lu", GetCurrentThreadId());

diff --git a/protocols/Gadu-Gadu/src/image.cpp b/protocols/Gadu-Gadu/src/image.cpp
index 56528ba82b..7fccf30251 100644
--- a/protocols/Gadu-Gadu/src/image.cpp
+++ b/protocols/Gadu-Gadu/src/image.cpp
@@ -226,10 +226,10 @@ TCHAR *gg_img_getfilter(TCHAR *szFilter, int nSize)
 	szFilterMask = _T("*.bmp;*.gif;*.jpeg;*.jpg;*.png");

 

 	// Make up filter

-	mir_tstrncpy(pFilter, szFilterName, nSize);

+	_tcsncpy(pFilter, szFilterName, nSize);

 	pFilter += mir_tstrlen(pFilter) + 1;

 	if (pFilter >= szFilter + nSize) return NULL;

-	mir_tstrncpy(pFilter, szFilterMask, nSize - (pFilter - szFilter));

+	_tcsncpy(pFilter, szFilterMask, nSize - (pFilter - szFilter));

 	pFilter += mir_tstrlen(pFilter) + 1;

 	if (pFilter >= szFilter + nSize) return NULL;

 	*pFilter = 0;

@@ -251,7 +251,7 @@ int gg_img_saveimage(HWND hwnd, GGIMAGEENTRY *dat)
 	gg_img_getfilter(szFilter, SIZEOF(szFilter));

 

 	TCHAR szFileName[MAX_PATH];

-	mir_tstrncpy(szFileName, dat->lpszFileName, SIZEOF(szFileName));

+	_tcsncpy(szFileName, dat->lpszFileName, SIZEOF(szFileName));

 

 	OPENFILENAME ofn = {0};

 	ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400;

diff --git a/protocols/Gadu-Gadu/src/import.cpp b/protocols/Gadu-Gadu/src/import.cpp
index 42ee730f8e..2ca709ae01 100644
--- a/protocols/Gadu-Gadu/src/import.cpp
+++ b/protocols/Gadu-Gadu/src/import.cpp
@@ -119,7 +119,7 @@ char *strndup(char *str, int c)
 {

 	char *ret = (char*)malloc(c + 1);

 	ret[c] = 0;

-	mir_strncpy(ret, str, c);

+	strncpy(ret, str, c);

 	return ret;

 }

 

@@ -174,7 +174,7 @@ void GGPROTO::parsecontacts(char *contacts)
 			if (n && n != p)

 			{

 				strPhone = (char*)malloc((n - p) + 5);

-				mir_strncpy(strPhone, p, (n - p));

+				strncpy(strPhone, p, (n - p));

 				mir_strcpy((strPhone + (n - p)), " SMS"); // Add SMS postfix

 			}

 			p = (n + 1);

@@ -336,24 +336,24 @@ INT_PTR GGPROTO::import_text(WPARAM wParam, LPARAM lParam)
 

 	OPENFILENAME ofn = {0};

 	ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400;

-	mir_tstrncpy(filter, TranslateT("Text files"), SIZEOF(filter));

+	_tcsncpy(filter, TranslateT("Text files"), SIZEOF(filter));

 	mir_tstrncat(filter, _T(" (*.txt)"), SIZEOF(filter) - mir_tstrlen(filter));

 	pfilter = filter + mir_tstrlen(filter) + 1;

 	if (pfilter >= filter + SIZEOF(filter))

 		return 0;

 

-	mir_tstrncpy(pfilter, _T("*.TXT"), SIZEOF(filter) - (pfilter - filter));

+	_tcsncpy(pfilter, _T("*.TXT"), SIZEOF(filter) - (pfilter - filter));

 	pfilter = pfilter + mir_tstrlen(pfilter) + 1;

 	if (pfilter >= filter + SIZEOF(filter))

 		return 0;

-	mir_tstrncpy(pfilter, TranslateT("All Files"), SIZEOF(filter) - (pfilter - filter));

+	_tcsncpy(pfilter, TranslateT("All Files"), SIZEOF(filter) - (pfilter - filter));

 	mir_tstrncat(pfilter, _T(" (*)"), SIZEOF(filter) - (pfilter - filter) - mir_tstrlen(pfilter));

 	pfilter = pfilter + mir_tstrlen(pfilter) + 1;

 

 	if (pfilter >= filter + SIZEOF(filter))

 		return 0;

 

-	mir_tstrncpy(pfilter, _T("*"), SIZEOF(filter) - (pfilter - filter));

+	_tcsncpy(pfilter, _T("*"), SIZEOF(filter) - (pfilter - filter));

 	pfilter = pfilter + mir_tstrlen(pfilter) + 1;

 	if (pfilter >= filter + SIZEOF(filter))

 		return 0;

@@ -403,25 +403,25 @@ INT_PTR GGPROTO::export_text(WPARAM wParam, LPARAM lParam)
 	OPENFILENAME ofn = {0};

 	TCHAR filter[512], *pfilter;

 

-	mir_tstrncpy(str, TranslateT("contacts"), SIZEOF(str));

+	_tcsncpy(str, TranslateT("contacts"), SIZEOF(str));

 	mir_tstrncat(str, _T(".txt"), SIZEOF(str) - mir_tstrlen(str));

 

 	ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400;

-	mir_tstrncpy(filter, TranslateT("Text files"), SIZEOF(filter));

+	_tcsncpy(filter, TranslateT("Text files"), SIZEOF(filter));

 	mir_tstrncat(filter, _T(" (*.txt)"), SIZEOF(filter) - mir_tstrlen(filter));

 	pfilter = filter + mir_tstrlen(filter) + 1;

 	if (pfilter >= filter + SIZEOF(filter))

 		return 0;

-	mir_tstrncpy(pfilter, _T("*.TXT"), SIZEOF(filter) - (pfilter - filter));

+	_tcsncpy(pfilter, _T("*.TXT"), SIZEOF(filter) - (pfilter - filter));

 	pfilter = pfilter + mir_tstrlen(pfilter) + 1;

 	if (pfilter >= filter + SIZEOF(filter))

 		return 0;

-	mir_tstrncpy(pfilter, TranslateT("All Files"), SIZEOF(filter) - (pfilter - filter));

+	_tcsncpy(pfilter, TranslateT("All Files"), SIZEOF(filter) - (pfilter - filter));

 	mir_tstrncat(pfilter, _T(" (*)"), SIZEOF(filter) - (pfilter - filter) - mir_tstrlen(pfilter));

 	pfilter = pfilter + mir_tstrlen(pfilter) + 1;

 	if (pfilter >= filter + SIZEOF(filter))

 		return 0;

-	mir_tstrncpy(pfilter, _T("*"), SIZEOF(filter) - (pfilter - filter));

+	_tcsncpy(pfilter, _T("*"), SIZEOF(filter) - (pfilter - filter));

 	pfilter = pfilter + mir_tstrlen(pfilter) + 1;

 	if (pfilter >= filter + SIZEOF(filter))

 		return 0;

diff --git a/protocols/Gadu-Gadu/src/services.cpp b/protocols/Gadu-Gadu/src/services.cpp
index 09b79b9b44..d0f442d872 100644
--- a/protocols/Gadu-Gadu/src/services.cpp
+++ b/protocols/Gadu-Gadu/src/services.cpp
@@ -42,7 +42,7 @@ char *gg_status2db(int status, const char *suffix)
 		case ID_STATUS_OUTTOLUNCH:	prefix = "Otl"; break;

 		default: return NULL;

 	}

-	mir_strncpy(str, prefix, sizeof(str));

+	strncpy(str, prefix, sizeof(str));

 	mir_strncat(str, suffix, sizeof(str) - mir_strlen(str));

 	return str;

 }

diff --git a/protocols/Gadu-Gadu/src/token.cpp b/protocols/Gadu-Gadu/src/token.cpp
index 85df02f089..2fcf36d31d 100644
--- a/protocols/Gadu-Gadu/src/token.cpp
+++ b/protocols/Gadu-Gadu/src/token.cpp
@@ -132,7 +132,7 @@ int GGPROTO::gettoken(GGTOKEN *token)
 	}

 

 	// Return token id

-	mir_strncpy(dat.id, t->tokenid, sizeof(dat.id));

+	strncpy(dat.id, t->tokenid, sizeof(dat.id));

 	dat.width = t->width;

 	dat.height = t->height;

 

@@ -154,8 +154,8 @@ int GGPROTO::gettoken(GGTOKEN *token)
 		return FALSE;

 

 	// Fillup patterns

-	mir_strncpy(token->id, dat.id, sizeof(token->id));

-	mir_strncpy(token->val, dat.val, sizeof(token->val));

+	strncpy(token->id, dat.id, sizeof(token->id));

+	strncpy(token->val, dat.val, sizeof(token->val));

 

 	return TRUE;

 }

diff --git a/protocols/Gadu-Gadu/src/userutils.cpp b/protocols/Gadu-Gadu/src/userutils.cpp
index 1dd223b08a..a5fcae5ee3 100644
--- a/protocols/Gadu-Gadu/src/userutils.cpp
+++ b/protocols/Gadu-Gadu/src/userutils.cpp
@@ -126,7 +126,7 @@ void *gg_dochpass(GGPROTO *gg, uin_t uin, char *password, char *newPass)
 

 	if (!gg->getString(GG_KEY_EMAIL, &dbv_email)) 

 	{

-		mir_strncpy(email, dbv_email.pszVal, sizeof(email));

+		strncpy(email, dbv_email.pszVal, sizeof(email));

 		db_free(&dbv_email);

 	}