From 41f218316dce6b1bfcfb0f2754379fa74c5138ed Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 19 Oct 2013 14:35:34 +0000 Subject: warning fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@6534 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/BasicHistory/src/EventList.cpp | 3 +-- plugins/BasicHistory/src/Scheduler.cpp | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'plugins/BasicHistory') diff --git a/plugins/BasicHistory/src/EventList.cpp b/plugins/BasicHistory/src/EventList.cpp index 4f98cb34e7..93e3440f72 100644 --- a/plugins/BasicHistory/src/EventList.cpp +++ b/plugins/BasicHistory/src/EventList.cpp @@ -643,7 +643,7 @@ void EventList::MargeMessages(const std::vector& messa dbei.cbBlob = WideCharToMultiByte(cp, 0, msg.message.c_str(), (int)msg.message.length() + 1, buf, dbei.cbBlob, NULL, NULL); dbei.pBlob = (PBYTE)buf; db_event_add(hContact, &dbei); - delete buf; + delete [] buf; } } @@ -728,7 +728,6 @@ void EventList::AddImporter(HANDLE hContact, IImport::ImportType type, const std EnterCriticalSection(&criticalSection); TCHAR buf[32]; mir_sntprintf(buf, SIZEOF(buf), _T("%016llx"), (unsigned long long int)hContact); - std::wstring internalFile = contactFileDir; ImportDiscData data; data.file = contactFileDir + buf; data.type = type; diff --git a/plugins/BasicHistory/src/Scheduler.cpp b/plugins/BasicHistory/src/Scheduler.cpp index 768b9fe5b5..ec57f9726e 100644 --- a/plugins/BasicHistory/src/Scheduler.cpp +++ b/plugins/BasicHistory/src/Scheduler.cpp @@ -984,7 +984,6 @@ bool ZipFiles(const std::wstring& dir, std::wstring zipFilePath, const std::stri bool UnzipFiles(const std::wstring& dir, std::wstring& zipFilePath, const std::string& password) { - std::list files; bool error = false; zlib_filefunc_def pzlib_filefunc_def; fill_win32_filefunc(&pzlib_filefunc_def); @@ -1195,7 +1194,6 @@ bool FtpFiles(const std::wstring& dir, const std::wstring& filePath, const std:: bool FtpGetFiles(const std::wstring& dir, const std::list& files, const std::wstring& ftpName) { - std::map existingContacts; std::wstring script = dir + _T("\\script.sc"); std::wofstream stream (script.c_str()); if (stream.is_open()) { -- cgit v1.2.3