From 548926936703ed87ad839a78beb310c7f1ecb3de Mon Sep 17 00:00:00 2001 From: vng Date: Thu, 7 Mar 2013 13:48:30 +0300 Subject: [PATCH] Fix formatting according to code review. --- coding/coding_tests/zip_creator_test.cpp | 26 ++++++------ coding/zip_creator.cpp | 50 ++++++++++++------------ 2 files changed, 40 insertions(+), 36 deletions(-) diff --git a/coding/coding_tests/zip_creator_test.cpp b/coding/coding_tests/zip_creator_test.cpp index 8658227fef..9b96acafee 100644 --- a/coding/coding_tests/zip_creator_test.cpp +++ b/coding/coding_tests/zip_creator_test.cpp @@ -12,20 +12,22 @@ namespace { - void CreateAndTestZip(string const & filePath, string const & zipPath) - { - TEST(CreateZipFromPathDeflatedAndDefaultCompression(filePath, zipPath), ()); - vector files; - ZipFileReader::FilesList(zipPath, files); - string const unzippedFile = "unzipped.tmp"; - ZipFileReader::UnzipFile(zipPath, files[0], unzippedFile); +void CreateAndTestZip(string const & filePath, string const & zipPath) +{ + TEST(CreateZipFromPathDeflatedAndDefaultCompression(filePath, zipPath), ()); + + vector files; + ZipFileReader::FilesList(zipPath, files); + string const unzippedFile = "unzipped.tmp"; + ZipFileReader::UnzipFile(zipPath, files[0], unzippedFile); + + TEST(my::IsEqualFiles(filePath, unzippedFile), ()); + TEST(my::DeleteFileX(filePath), ()); + TEST(my::DeleteFileX(zipPath), ()); + TEST(my::DeleteFileX(unzippedFile), ()); +} - TEST(my::IsEqualFiles(filePath, unzippedFile), ()); - TEST(my::DeleteFileX(filePath), ()); - TEST(my::DeleteFileX(zipPath), ()); - TEST(my::DeleteFileX(unzippedFile), ()); - } } UNIT_TEST(CreateZip_BigFile) diff --git a/coding/zip_creator.cpp b/coding/zip_creator.cpp index 557b6905f3..a9a8928906 100644 --- a/coding/zip_creator.cpp +++ b/coding/zip_creator.cpp @@ -13,33 +13,35 @@ namespace { - struct ZipHandle - { - zipFile m_zipFile; - ZipHandle(string const & filePath) - { - m_zipFile = zipOpen(filePath.c_str(), 0); - } - ~ZipHandle() - { - if (m_zipFile) - zipClose(m_zipFile, NULL); - } - }; - void CreateTMZip(tm_zip & res) +struct ZipHandle +{ + zipFile m_zipFile; + ZipHandle(string const & filePath) { - time_t rawtime; - struct tm * timeinfo; - time ( &rawtime ); - timeinfo = localtime ( &rawtime ); - res.tm_sec = timeinfo->tm_sec; - res.tm_min = timeinfo->tm_min; - res.tm_hour = timeinfo->tm_hour; - res.tm_mday = timeinfo->tm_mday; - res.tm_mon = timeinfo->tm_mon; - res.tm_year = timeinfo->tm_year; + m_zipFile = zipOpen(filePath.c_str(), 0); } + ~ZipHandle() + { + if (m_zipFile) + zipClose(m_zipFile, NULL); + } +}; + +void CreateTMZip(tm_zip & res) +{ + time_t rawtime; + struct tm * timeinfo; + time ( &rawtime ); + timeinfo = localtime ( &rawtime ); + res.tm_sec = timeinfo->tm_sec; + res.tm_min = timeinfo->tm_min; + res.tm_hour = timeinfo->tm_hour; + res.tm_mday = timeinfo->tm_mday; + res.tm_mon = timeinfo->tm_mon; + res.tm_year = timeinfo->tm_year; +} + } bool CreateZipFromPathDeflatedAndDefaultCompression(string const & filePath, string const & zipFilePath)