From 5a19f89d6c8eb148e6bb7b450f702b666f685ed1 Mon Sep 17 00:00:00 2001
From: Rozhuk Ivan <rozhuk.im@gmail.com>
Date: Sat, 13 Dec 2014 10:52:12 +0000
Subject: MoveMemory -> memmove

git-svn-id: http://svn.miranda-ng.org/main/trunk@11365 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/IRCG/src/services.cpp         | 2 +-
 protocols/IcqOscarJ/src/icq_xstatus.cpp | 2 +-
 protocols/SkypeClassic/src/memlist.cpp  | 4 ++--
 protocols/Tlen/src/tlen_presence.cpp    | 2 +-
 protocols/Yahoo/src/http_gateway.cpp    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'protocols')

diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp
index 2738f3e919..3ec6a34b87 100644
--- a/protocols/IRCG/src/services.cpp
+++ b/protocols/IRCG/src/services.cpp
@@ -484,7 +484,7 @@ static void DoChatFormatting(TCHAR* pszText)
 				break;
 			}
 
-			MoveMemory(p1 + mir_tstrlen(InsertThis), p1 + iRemoveChars, sizeof(TCHAR)*(mir_tstrlen(p1) - iRemoveChars + 1));
+			memmove(p1 + mir_tstrlen(InsertThis), p1 + iRemoveChars, sizeof(TCHAR)*(mir_tstrlen(p1) - iRemoveChars + 1));
 			memcpy(p1, InsertThis, sizeof(TCHAR)*mir_tstrlen(InsertThis));
 			if (iRemoveChars || mir_tstrlen(InsertThis))
 				p1 += mir_tstrlen(InsertThis);
diff --git a/protocols/IcqOscarJ/src/icq_xstatus.cpp b/protocols/IcqOscarJ/src/icq_xstatus.cpp
index 24b7350a75..b324720994 100644
--- a/protocols/IcqOscarJ/src/icq_xstatus.cpp
+++ b/protocols/IcqOscarJ/src/icq_xstatus.cpp
@@ -561,7 +561,7 @@ static LRESULT CALLBACK MessageEditSubclassProc(HWND hwnd,UINT msg,WPARAM wParam
 			SendMessage(hwnd, WM_KEYDOWN, VK_LEFT, 0);
 			SendMessage(hwnd, EM_GETSEL, (WPARAM)&start, (LPARAM) (PDWORD) NULL);
 			WCHAR *text = GetWindowTextUcs(hwnd);
-			MoveMemory(text + start, text + end, sizeof(WCHAR) * (mir_wstrlen(text) + 1 - end));
+			memmove(text + start, text + end, sizeof(WCHAR) * (mir_wstrlen(text) + 1 - end));
 			SetWindowTextUcs(hwnd, text);
 			SAFE_FREE(&text);
 			SendMessage(hwnd, EM_SETSEL, start, start);
diff --git a/protocols/SkypeClassic/src/memlist.cpp b/protocols/SkypeClassic/src/memlist.cpp
index b14133ef57..73c07d64d8 100644
--- a/protocols/SkypeClassic/src/memlist.cpp
+++ b/protocols/SkypeClassic/src/memlist.cpp
@@ -88,7 +88,7 @@ BOOL List_InsertElementAt(TYP_LIST *pstHandle, void *pItem, unsigned int uiPos)
 	}
 
 	if (uiPos<pstHandle->uiCount)
-		MoveMemory (&pstHandle->apStorage[uiPos+1], &pstHandle->apStorage[uiPos], (pstHandle->uiCount-uiPos)*sizeof(void*));
+		memmove (&pstHandle->apStorage[uiPos+1], &pstHandle->apStorage[uiPos], (pstHandle->uiCount-uiPos)*sizeof(void*));
 	pstHandle->apStorage[uiPos] = pItem;
     pstHandle->uiCount++;
 	LeaveCriticalSection (&pstHandle->cs);
@@ -102,7 +102,7 @@ void *List_RemoveElementAt(TYP_LIST *pstHandle, unsigned int uiPos)
 	EnterCriticalSection (&pstHandle->cs);
     pRet = pstHandle->apStorage[uiPos];
 	if (uiPos<pstHandle->uiCount)
-		MoveMemory (&pstHandle->apStorage[uiPos], &pstHandle->apStorage[uiPos+1], (pstHandle->uiCount-uiPos)*sizeof(void*));
+		memmove (&pstHandle->apStorage[uiPos], &pstHandle->apStorage[uiPos+1], (pstHandle->uiCount-uiPos)*sizeof(void*));
     pstHandle->uiCount--;
 	LeaveCriticalSection (&pstHandle->cs);
     return pRet;
diff --git a/protocols/Tlen/src/tlen_presence.cpp b/protocols/Tlen/src/tlen_presence.cpp
index 7f45b4547e..3f4785206e 100644
--- a/protocols/Tlen/src/tlen_presence.cpp
+++ b/protocols/Tlen/src/tlen_presence.cpp
@@ -282,7 +282,7 @@ static void TlenSendPresenceTo(TlenProtocol *proto, int status, char *to)
 							GetDateFormatA(LOCALE_USER_DEFAULT,DATE_SHORTDATE,NULL,NULL,substituteStr,sizeof(substituteStr));
 						else continue;
 						if (strlen(substituteStr)>6) ptr=(char*)mir_realloc(ptr,strlen(ptr)+1+strlen(substituteStr)-6);
-						MoveMemory(ptr+i+strlen(substituteStr),ptr+i+6,strlen(ptr)-i-5);
+						memmove(ptr+i+strlen(substituteStr),ptr+i+6,strlen(ptr)-i-5);
 						memcpy(ptr+i,substituteStr,strlen(substituteStr));
 					}
 				}
diff --git a/protocols/Yahoo/src/http_gateway.cpp b/protocols/Yahoo/src/http_gateway.cpp
index bace76d247..9fbfdcb57f 100644
--- a/protocols/Yahoo/src/http_gateway.cpp
+++ b/protocols/Yahoo/src/http_gateway.cpp
@@ -70,7 +70,7 @@ PBYTE YAHOO_httpGatewayUnwrapRecv(NETLIBHTTPREQUEST *nlhr, PBYTE buf, int len, i
         *outBufLen = 0;
         return buf;
     } else  if ( (buf[4] == 'Y') && (buf[5] == 'M') && (buf[6] == 'S') && (buf[7] == 'G')) {
-		MoveMemory( buf, buf + 4, len - 4);
+		memmove( buf, buf + 4, len - 4);
 		*outBufLen = len-4;// we take off 4 bytes from the beginning
 		 
 		return buf;                 
-- 
cgit v1.2.3