From 477a6ea70d0bb1b1dfe9cbd9a15b6dad0284ddeb Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 21 Feb 2018 18:40:03 +0300 Subject: all another C++'11 iterators --- plugins/Db_autobackups/src/zip.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'plugins/Db_autobackups/src') diff --git a/plugins/Db_autobackups/src/zip.cpp b/plugins/Db_autobackups/src/zip.cpp index c4a2b145f1..c0c7e08c43 100644 --- a/plugins/Db_autobackups/src/zip.cpp +++ b/plugins/Db_autobackups/src/zip.cpp @@ -9,17 +9,14 @@ int CreateZipFile(const char *szDestPath, OBJLIST &lstFiles, const std: zip_fileinfo fi = { 0 }; int ret = 0; - for (int i = 0; i < lstFiles.getCount(); i++) - { + for (int i = 0; i < lstFiles.getCount(); i++) { ZipFile &zf = lstFiles[i]; HANDLE hSrcFile = CreateFileA(zf.sPath.c_str(), GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr); - if (hSrcFile != INVALID_HANDLE_VALUE) - { + if (hSrcFile != INVALID_HANDLE_VALUE) { int iOpenRes = zipOpenNewFileInZip(hZip, zf.sZipPath.c_str(), &fi, nullptr, 0, nullptr, 0, "", Z_DEFLATED, Z_BEST_COMPRESSION); - if (iOpenRes == ZIP_OK) - { + if (iOpenRes == ZIP_OK) { DWORD dwRead; BYTE buf[0x40000]; @@ -27,17 +24,15 @@ int CreateZipFile(const char *szDestPath, OBJLIST &lstFiles, const std: zipCloseFileInZip(hZip); CloseHandle(hSrcFile); - if (!fnCallback(i)) - { + if (!fnCallback(i)) { ret = 3; break; } } - else - CloseHandle(hSrcFile); + else CloseHandle(hSrcFile); } } zipClose(hZip, CMStringA(FORMAT, Translate("Miranda NG [%s] database backup"), g_szMirVer)); return ret; -} \ No newline at end of file +} -- cgit v1.2.3