diff options
| author | Rozhuk Ivan <rozhuk.im@gmail.com> | 2014-12-13 10:52:12 +0000 |
|---|---|---|
| committer | Rozhuk Ivan <rozhuk.im@gmail.com> | 2014-12-13 10:52:12 +0000 |
| commit | 5a19f89d6c8eb148e6bb7b450f702b666f685ed1 (patch) | |
| tree | 2214a02a6785d5f4716ee53d191674746b34790c /plugins/AssocMgr | |
| parent | 518e10779e770eac62fcedc96e750e538fa395ba (diff) | |
MoveMemory -> memmove
git-svn-id: http://svn.miranda-ng.org/main/trunk@11365 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/AssocMgr')
| -rw-r--r-- | plugins/AssocMgr/src/assoclist.cpp | 2 | ||||
| -rw-r--r-- | plugins/AssocMgr/src/reg.cpp | 6 | ||||
| -rw-r--r-- | plugins/AssocMgr/src/test.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/plugins/AssocMgr/src/assoclist.cpp b/plugins/AssocMgr/src/assoclist.cpp index a0692e1d38..c9cb806f7c 100644 --- a/plugins/AssocMgr/src/assoclist.cpp +++ b/plugins/AssocMgr/src/assoclist.cpp @@ -471,7 +471,7 @@ static BOOL RemoveAssocItem_Worker(const char *pszClassName) /* resize storage array */
if ((index+1)<nAssocListCount)
- MoveMemory(assoc, &pAssocList[index+1], ((nAssocListCount-index-1)*sizeof(ASSOCDATA)));
+ memmove(assoc, &pAssocList[index+1], ((nAssocListCount-index-1)*sizeof(ASSOCDATA)));
pAssocListBuf = (ASSOCDATA*)mir_realloc(pAssocList, (nAssocListCount-1)*sizeof(ASSOCDATA));
if(pAssocListBuf!= NULL) pAssocList = pAssocListBuf;
--nAssocListCount;
diff --git a/plugins/AssocMgr/src/reg.cpp b/plugins/AssocMgr/src/reg.cpp index 254c71be7c..0dcb9eae85 100644 --- a/plugins/AssocMgr/src/reg.cpp +++ b/plugins/AssocMgr/src/reg.cpp @@ -149,7 +149,7 @@ TCHAR *MakeRunCommand(BOOL fMirExe,BOOL fFixedDbProfile) /* surround by quotes if failed */
DWORD len = mir_tstrlen(szExe);
if ( _tcschr(szExe,_T(' ')) != NULL && (len+2) < SIZEOF(szExe)) {
- MoveMemory(szExe, szExe+1, (len+1)*sizeof(TCHAR));
+ memmove(szExe, szExe+1, (len+1)*sizeof(TCHAR));
szExe[len+2] = szExe[0] = _T('\"');
szExe[len+3] = 0;
}
@@ -354,7 +354,7 @@ static BOOL ReadDbBackupData(const char *pszSetting,DWORD *pdwType,BYTE **ppData *pdwType=*(DWORD*)dbv.pbVal;
*ppData=dbv.pbVal;
*pcbData=dbv.cpbVal-sizeof(DWORD);
- MoveMemory(*ppData,*ppData+sizeof(DWORD),*pcbData);
+ memmove(*ppData,*ppData+sizeof(DWORD),*pcbData);
return TRUE;
}
db_free(&dbv);
@@ -552,7 +552,7 @@ void CleanupRegTreeBackupSettings(void) }
mir_free(ppszSettings[j]);
- MoveMemory(&ppszSettings[j], &ppszSettings[j+1], ((--nSettingsCount)-j) * sizeof(char*));
+ memmove(&ppszSettings[j], &ppszSettings[j+1], ((--nSettingsCount)-j) * sizeof(char*));
--j; /* reiterate current index */
}
}
diff --git a/plugins/AssocMgr/src/test.cpp b/plugins/AssocMgr/src/test.cpp index a1ce3308d0..70642bd272 100644 --- a/plugins/AssocMgr/src/test.cpp +++ b/plugins/AssocMgr/src/test.cpp @@ -228,7 +228,7 @@ static void TrimString(char *str) len=mir_strlen(str);
while(str[0]!='\0' && (unsigned char)str[len-1]<=' ') str[--len]=0;
for(start=0;str[start] && (unsigned char)str[start]<=' ';++start);
- MoveMemory(str,str+start,len-start+1);
+ memmove(str,str+start,len-start+1);
}
static BOOL IsEmpty(const char *str)
|