From 2a815f8820ca402626bd283dd5b75744ddeb9812 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 23 May 2015 18:55:59 +0000
Subject: mir_tstrncpy <> _tcsncpy

git-svn-id: http://svn.miranda-ng.org/main/trunk@13791 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/netlib/netlibhttp.cpp     |  2 +-
 src/modules/netlib/netlibsecurity.cpp |  2 +-
 src/modules/netlib/netlibsock.cpp     |  2 +-
 src/modules/netlib/netlibupnp.cpp     | 12 ++++++------
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/modules/netlib')

diff --git a/src/modules/netlib/netlibhttp.cpp b/src/modules/netlib/netlibhttp.cpp
index a30a15f2bf..cd7a173f1a 100644
--- a/src/modules/netlib/netlibhttp.cpp
+++ b/src/modules/netlib/netlibhttp.cpp
@@ -583,7 +583,7 @@ INT_PTR NetlibHttpSendRequest(WPARAM wParam, LPARAM lParam)
 
 					nlc->szNewUrl = (char*)mir_realloc(nlc->szNewUrl, rlen + mir_strlen(tmpUrl) * 3 + 1);
 
-					mir_strncpy(nlc->szNewUrl, pszFullUrl, rlen);
+					strncpy(nlc->szNewUrl, pszFullUrl, rlen);
 					mir_strcpy(nlc->szNewUrl + rlen, tmpUrl);
 					pszFullUrl = nlc->szNewUrl;
 					pszUrl = NULL;
diff --git a/src/modules/netlib/netlibsecurity.cpp b/src/modules/netlib/netlibsecurity.cpp
index a00f667076..31873e94a7 100644
--- a/src/modules/netlib/netlibsecurity.cpp
+++ b/src/modules/netlib/netlibsecurity.cpp
@@ -292,7 +292,7 @@ char* NtlmCreateResponseFromChallenge(HANDLE hSecurity, const char *szChallenge,
 						size_t newLoginLen = mir_tstrlen(login) + domainLen + 1;
 						TCHAR *newLogin = (TCHAR*)alloca(newLoginLen * sizeof(TCHAR));
 
-						mir_tstrncpy(newLogin, domainName, domainLen);
+						_tcsncpy(newLogin, domainName, domainLen);
 						newLogin[domainLen] = '\\';
 						mir_tstrcpy(newLogin + domainLen + 1, login);
 
diff --git a/src/modules/netlib/netlibsock.cpp b/src/modules/netlib/netlibsock.cpp
index 5aaea3613a..e53e73bd89 100644
--- a/src/modules/netlib/netlibsock.cpp
+++ b/src/modules/netlib/netlibsock.cpp
@@ -237,7 +237,7 @@ void NetlibGetConnectionInfo(NetlibConnection* nlc, NETLIBCONNINFO *connInfo)
 		connInfo->dwIpv4 = sin.si_family == AF_INET ? htonl(sin.Ipv4.sin_addr.s_addr) : 0;
 
 		char *szTmp = NetlibAddressToString(&sin);
-		mir_strncpy(connInfo->szIpPort, szTmp, sizeof(connInfo->szIpPort));
+		strncpy(connInfo->szIpPort, szTmp, sizeof(connInfo->szIpPort));
 		connInfo->szIpPort[sizeof(connInfo->szIpPort) - 1] = 0;
 		mir_free(szTmp);
 	}
diff --git a/src/modules/netlib/netlibupnp.cpp b/src/modules/netlib/netlibupnp.cpp
index 54fc04d640..2e3445126f 100644
--- a/src/modules/netlib/netlibupnp.cpp
+++ b/src/modules/netlib/netlibupnp.cpp
@@ -147,7 +147,7 @@ static bool txtParseParam(char* szData, char* presearch,
 	while (*(cp1-1) == ' ' && cp1 > cp) --cp1;
 
 	len = min((size_t)(cp1 - cp), size-1);
-	mir_strncpy(param, cp, len);
+	strncpy(param, cp, len);
 	param[len] = 0;
 
 	return true;
@@ -171,7 +171,7 @@ void parseURL(char* szUrl, char* szHost, unsigned short* sPort, char* szPath)
 	if (szHost != NULL) {
 		sz = pport - phost + 1;
 		if (sz > 256) sz = 256;
-		mir_strncpy(szHost, phost, sz);
+		strncpy(szHost, phost, sz);
 		szHost[sz - 1] = 0;
 	}
 
@@ -185,7 +185,7 @@ void parseURL(char* szUrl, char* szHost, unsigned short* sPort, char* szPath)
 	}
 
 	if (szPath != NULL) {
-		mir_strncpy(szPath, ppath, 256);
+		strncpy(szPath, ppath, 256);
 		szPath[255] = 0;
 	}
 }
@@ -514,7 +514,7 @@ static bool getUPnPURLs(char* szUrl, size_t sizeUrl)
 		size_t ctlLen;
 
 		txtParseParam(szData, NULL, "<URLBase>", "</URLBase>", szTemp, sizeof(szTemp));
-		mir_strncpy(szCtlUrl, szTemp[0] ? szTemp : szUrl, sizeof(szCtlUrl));
+		strncpy(szCtlUrl, szTemp[0] ? szTemp : szUrl, sizeof(szCtlUrl));
 		szCtlUrl[sizeof(szCtlUrl) - 1] = 0;
 
 		mir_snprintf(szTemp, SIZEOF(szTemp), search_device, szDev);
@@ -541,11 +541,11 @@ static bool getUPnPURLs(char* szUrl, size_t sizeUrl)
 				size_t ctlCLen = mir_strlen(szCtlUrl);
 				rpth = szCtlUrl + ctlCLen;
 				if (ctlCLen != 0 && *(rpth - 1) != '/')
-					mir_strncpy(rpth++, "/", sizeof(szCtlUrl) - ctlCLen);
+					strncpy(rpth++, "/", sizeof(szCtlUrl) - ctlCLen);
 			}
 
 			ctlLen = sizeof(szCtlUrl) - (rpth - szCtlUrl);
-			mir_strncpy(rpth, szUrl, ctlLen);
+			strncpy(rpth, szUrl, ctlLen);
 			szCtlUrl[sizeof(szCtlUrl) - 1] = 0;
 		}
 		else {
-- 
cgit v1.2.3