From 688f55ba998c19304a29727c910504903f4cc49a Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 30 Nov 2014 18:51:36 +0000
Subject: lstr* replacements

git-svn-id: http://svn.miranda-ng.org/main/trunk@11176 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/netlib/netlibhttp.cpp     |  2 +-
 src/modules/netlib/netliblog.cpp      | 10 +++++-----
 src/modules/netlib/netlibopenconn.cpp |  6 +++---
 src/modules/netlib/netlibsecurity.cpp |  8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/modules/netlib')

diff --git a/src/modules/netlib/netlibhttp.cpp b/src/modules/netlib/netlibhttp.cpp
index 87e1278f86..b7a529853b 100644
--- a/src/modules/netlib/netlibhttp.cpp
+++ b/src/modules/netlib/netlibhttp.cpp
@@ -1117,7 +1117,7 @@ next:
 
 	if (chunked) {
 		nlhrReply->headers[chunkhdr].szName = (char*)mir_realloc(nlhrReply->headers[chunkhdr].szName, 16);
-		lstrcpyA(nlhrReply->headers[chunkhdr].szName, "Content-Length");
+		mir_strcpy(nlhrReply->headers[chunkhdr].szName, "Content-Length");
 
 		nlhrReply->headers[chunkhdr].szValue = (char*)mir_realloc(nlhrReply->headers[chunkhdr].szValue, 16);
 		mir_snprintf(nlhrReply->headers[chunkhdr].szValue, 16, "%u", nlhrReply->dataLength);
diff --git a/src/modules/netlib/netliblog.cpp b/src/modules/netlib/netliblog.cpp
index 330e8e3588..482aa33200 100644
--- a/src/modules/netlib/netliblog.cpp
+++ b/src/modules/netlib/netliblog.cpp
@@ -65,7 +65,7 @@ static void InitLog()
 	}
 
 	ptrT szBuf(db_get_tsa(NULL, "Netlib", "File"));
-	if (lstrlen(szBuf)) {
+	if (mir_tstrlen(szBuf)) {
 		logOptions.tszUserFile = szBuf;
 
 		TCHAR path[MAX_PATH];
@@ -172,9 +172,9 @@ static INT_PTR CALLBACK LogOptionsDlgProc(HWND hwndDlg, UINT message, WPARAM wPa
 				}
 				_tcscpy(filter, TranslateT("All files"));
 				_tcscat(filter, _T(" (*)"));
-				TCHAR *pfilter = filter + lstrlen(filter) + 1;
+				TCHAR *pfilter = filter + mir_tstrlen(filter) + 1;
 				_tcscpy(pfilter, _T("*"));
-				pfilter = pfilter + lstrlen(pfilter) + 1;
+				pfilter = pfilter + mir_tstrlen(pfilter) + 1;
 				*pfilter = '\0';
 				ofn.lpstrFilter = filter;
 				ofn.lpstrFile = str;
@@ -189,7 +189,7 @@ static INT_PTR CALLBACK LogOptionsDlgProc(HWND hwndDlg, UINT message, WPARAM wPa
 				if (LOWORD(wParam) == IDC_RUNATSTARTBROWSE && _tcschr(str, ' ') != NULL) {
 					MoveMemory(str + 1, str, ((SIZEOF(str) - 2) * sizeof(TCHAR)));
 					str[0] = '"';
-					lstrcat(str, _T("\""));
+					mir_tstrcat(str, _T("\""));
 				}
 				SetWindowText(GetWindow((HWND)lParam, GW_HWNDPREV), str);
 			}
@@ -466,7 +466,7 @@ void NetlibDumpData(NetlibConnection *nlc, PBYTE buf, int len, int sent, int fla
 					pszBuf += wsprintfA(pszBuf, "%02X%c", buf[line + col], ((col & 3) == 3 && col != 15) ? '-' : ' '); //!!!!!!!!!!
 				// Fill out last line with blanks
 				for (; col < 16; col++) {
-					lstrcpyA(pszBuf, "   ");
+					mir_strcpy(pszBuf, "   ");
 					pszBuf += 3;
 				}
 				*pszBuf++ = ' ';
diff --git a/src/modules/netlib/netlibopenconn.cpp b/src/modules/netlib/netlibopenconn.cpp
index 79603015bd..100b7341c0 100644
--- a/src/modules/netlib/netlibopenconn.cpp
+++ b/src/modules/netlib/netlibopenconn.cpp
@@ -185,8 +185,8 @@ static int NetlibInitSocks5Connection(NetlibConnection *nlc, NetlibUser *nlu, NE
 		int nUserLen, nPassLen;
 		PBYTE pAuthBuf;
 
-		nUserLen = lstrlenA(nlu->settings.szProxyAuthUser);
-		nPassLen = lstrlenA(nlu->settings.szProxyAuthPassword);
+		nUserLen = mir_strlen(nlu->settings.szProxyAuthUser);
+		nPassLen = mir_strlen(nlu->settings.szProxyAuthPassword);
 		pAuthBuf = (PBYTE)mir_alloc(3+nUserLen+nPassLen);
 		pAuthBuf[0] = 1;		//auth version
 		pAuthBuf[1] = nUserLen;
@@ -218,7 +218,7 @@ static int NetlibInitSocks5Connection(NetlibConnection *nlc, NetlibUser *nlu, NE
 	if (nlc->dnsThroughProxy) {
 		hostIP = inet_addr(nloc->szHost);
 		if (hostIP == INADDR_NONE)
-			nHostLen = lstrlenA(nloc->szHost)+1;
+			nHostLen = mir_strlen(nloc->szHost)+1;
 		else nHostLen = 4;
 	}
 	else {
diff --git a/src/modules/netlib/netlibsecurity.cpp b/src/modules/netlib/netlibsecurity.cpp
index 404453c2d4..46fb1d0e06 100644
--- a/src/modules/netlib/netlibsecurity.cpp
+++ b/src/modules/netlib/netlibsecurity.cpp
@@ -331,11 +331,11 @@ char* NtlmCreateResponseFromChallenge(HANDLE hSecurity, const char *szChallenge,
 				const TCHAR* loginName = login;
 				const TCHAR* domainName = _tcschr(login, '\\');
 				int domainLen = 0;
-				int loginLen = lstrlen(loginName);
+				int loginLen = mir_tstrlen(loginName);
 				if (domainName != NULL)
 				{
 					loginName = domainName + 1;
-					loginLen = lstrlen(loginName);
+					loginLen = mir_tstrlen(loginName);
 					domainLen = domainName - login;
 					domainName = login;
 				}
@@ -343,13 +343,13 @@ char* NtlmCreateResponseFromChallenge(HANDLE hSecurity, const char *szChallenge,
 				{
 					loginName = login;
 					loginLen = domainName - login;
-					domainLen = lstrlen(++domainName);
+					domainLen = mir_tstrlen(++domainName);
 				}
 
 				auth.User = (PWORD)loginName;
 				auth.UserLength = loginLen;
 				auth.Password = (PWORD)psw;
-				auth.PasswordLength = lstrlen(psw);
+				auth.PasswordLength = mir_tstrlen(psw);
 				auth.Domain = (PWORD)domainName;
 				auth.DomainLength = domainLen;
 				auth.Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE;
-- 
cgit v1.2.3