From 450894ec572814925c03c7c1cdf3e977d32f839f Mon Sep 17 00:00:00 2001 From: Rozhuk Ivan Date: Sun, 30 Nov 2014 18:57:14 +0000 Subject: FillMemory -> memset git-svn-id: http://svn.miranda-ng.org/main/trunk@11177 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Boltun/src/actionQueue.cpp | 6 +++--- plugins/NewAwaySysMod/src/ContactList.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins') diff --git a/plugins/Boltun/src/actionQueue.cpp b/plugins/Boltun/src/actionQueue.cpp index ac7e76c06e..3dfb86402a 100644 --- a/plugins/Boltun/src/actionQueue.cpp +++ b/plugins/Boltun/src/actionQueue.cpp @@ -83,8 +83,8 @@ static bool NotifyTyping(MCONTACT hContact) static void TimerAnswer(MCONTACT hContact, const TalkBot::MessageInfo* info) { DBEVENTINFO ldbei; - int size = (int)info->Answer.length() + 1; - int bufsize = size; + size_t size = info->Answer.length() + 1; + size_t bufsize = size; char* msg; bufsize *= sizeof(TCHAR) + 1; @@ -92,7 +92,7 @@ static void TimerAnswer(MCONTACT hContact, const TalkBot::MessageInfo* info) if (!WideCharToMultiByte(CP_ACP, 0, info->Answer.c_str(), -1, msg, size, NULL, NULL)) - FillMemory(msg, size - 1, '-'); //In case of fault return "----" in ANSI part + memset(msg, '-', (size - 1)); //In case of fault return "----" in ANSI part CopyMemory(msg + size, info->Answer.c_str(), size * 2); CallContactService(hContact, PSS_MESSAGE, PREF_TCHAR, (LPARAM)msg); diff --git a/plugins/NewAwaySysMod/src/ContactList.h b/plugins/NewAwaySysMod/src/ContactList.h index 20020cc32f..b85df45a01 100644 --- a/plugins/NewAwaySysMod/src/ContactList.h +++ b/plugins/NewAwaySysMod/src/ContactList.h @@ -33,7 +33,7 @@ typedef TREEITEMARRAY* PTREEITEMARRAY; class CCLItemData // internal CCList's class { public: - CCLItemData(MCONTACT hContact = INVALID_CONTACT_ID): hContact(hContact) {FillMemory(ExtraIcons, sizeof(ExtraIcons), CLC_EXTRAICON_EMPTY);}; + CCLItemData(MCONTACT hContact = INVALID_CONTACT_ID): hContact(hContact) {memset(ExtraIcons, CLC_EXTRAICON_EMPTY, sizeof(ExtraIcons));}; BYTE ExtraIcons[MAXEXTRAICONS]; MCONTACT hContact; -- cgit v1.2.3