From 714dc6ddd26b256e95368637405935dfaaa38a87 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 25 Mar 2016 08:42:58 +0100 Subject: [PATCH] GH #1050 Zip: fix gcc -Wshadow warnings --- CppUnit/include/Poco/CppUnit/CppUnitException.h | 6 +++--- CppUnit/include/Poco/CppUnit/TestCaller.h | 6 +++--- CppUnit/include/Poco/CppUnit/TestCase.h | 2 +- CppUnit/include/Poco/CppUnit/TestFailure.h | 2 +- Zip/src/Compress.cpp | 8 ++++---- Zip/src/ZipLocalFileHeader.cpp | 10 +++++----- Zip/testsuite/src/CompressTest.cpp | 2 +- Zip/testsuite/src/PartialStreamTest.cpp | 2 +- Zip/testsuite/src/ZipTest.cpp | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/CppUnit/include/Poco/CppUnit/CppUnitException.h b/CppUnit/include/Poco/CppUnit/CppUnitException.h index 670290c58..46fc44bbd 100644 --- a/CppUnit/include/Poco/CppUnit/CppUnitException.h +++ b/CppUnit/include/Poco/CppUnit/CppUnitException.h @@ -68,17 +68,17 @@ inline CppUnitException::CppUnitException(const CppUnitException& other): except } -inline CppUnitException::CppUnitException (const std::string& message, long lineNumber, const std::string& fileName): _message(message), _lineNumber(lineNumber), _data1lineNumber(CPPUNIT_UNKNOWNLINENUMBER), _data2lineNumber(CPPUNIT_UNKNOWNLINENUMBER), _fileName(fileName) +inline CppUnitException::CppUnitException (const std::string& message, long line, const std::string& rFileName): _message(message), _lineNumber(line), _data1lineNumber(CPPUNIT_UNKNOWNLINENUMBER), _data2lineNumber(CPPUNIT_UNKNOWNLINENUMBER), _fileName(rFileName) { } -inline CppUnitException::CppUnitException (const std::string& message, long lineNumber, long data1lineNumber, const std::string& fileName): _message(message), _lineNumber(lineNumber), _data1lineNumber(data1lineNumber), _data2lineNumber(CPPUNIT_UNKNOWNLINENUMBER), _fileName(fileName) +inline CppUnitException::CppUnitException (const std::string& message, long line, long data1lineNumber, const std::string& rFileName): _message(message), _lineNumber(line), _data1lineNumber(data1lineNumber), _data2lineNumber(CPPUNIT_UNKNOWNLINENUMBER), _fileName(rFileName) { } -inline CppUnitException::CppUnitException (const std::string& message, long lineNumber, long data1lineNumber, long data2lineNumber, const std::string& fileName): _message(message), _lineNumber(lineNumber), _data1lineNumber(data1lineNumber), _data2lineNumber(data2lineNumber), _fileName(fileName) +inline CppUnitException::CppUnitException (const std::string& message, long line, long data1lineNumber, long data2lineNumber, const std::string& rFileName): _message(message), _lineNumber(line), _data1lineNumber(data1lineNumber), _data2lineNumber(data2lineNumber), _fileName(rFileName) { } diff --git a/CppUnit/include/Poco/CppUnit/TestCaller.h b/CppUnit/include/Poco/CppUnit/TestCaller.h index d859bb7ce..cfafaa2ce 100644 --- a/CppUnit/include/Poco/CppUnit/TestCaller.h +++ b/CppUnit/include/Poco/CppUnit/TestCaller.h @@ -56,10 +56,10 @@ class TestCaller: public TestCase typedef void (Fixture::*TestMethod)(); public: - TestCaller(const std::string& name, TestMethod test): - TestCase(name), + TestCaller(const std::string& rName, TestMethod test): + TestCase(rName), _test(test), - _fixture(new Fixture(name)) + _fixture(new Fixture(rName)) { } diff --git a/CppUnit/include/Poco/CppUnit/TestCase.h b/CppUnit/include/Poco/CppUnit/TestCase.h index cbe648a57..b1ede419f 100644 --- a/CppUnit/include/Poco/CppUnit/TestCase.h +++ b/CppUnit/include/Poco/CppUnit/TestCase.h @@ -173,7 +173,7 @@ protected: // Constructs a test case -inline TestCase::TestCase(const std::string& name): _name (name) +inline TestCase::TestCase(const std::string& rName): _name (rName) { } diff --git a/CppUnit/include/Poco/CppUnit/TestFailure.h b/CppUnit/include/Poco/CppUnit/TestFailure.h index 830dec1c8..eb391a6bb 100644 --- a/CppUnit/include/Poco/CppUnit/TestFailure.h +++ b/CppUnit/include/Poco/CppUnit/TestFailure.h @@ -52,7 +52,7 @@ protected: // Constructs a TestFailure with the given test and exception. -inline TestFailure::TestFailure(Test* failedTest, CppUnitException* thrownException): _failedTest(failedTest), _thrownException(thrownException) +inline TestFailure::TestFailure(Test* pFailedTest, CppUnitException* pThrownException): _failedTest(pFailedTest), _thrownException(pThrownException) { } diff --git a/Zip/src/Compress.cpp b/Zip/src/Compress.cpp index b335a3074..ed558d771 100644 --- a/Zip/src/Compress.cpp +++ b/Zip/src/Compress.cpp @@ -155,8 +155,8 @@ void Compress::addFileRaw(std::istream& in, const ZipLocalFileHeader& h, const P if(hdr.hasExtraField()) // Update sizes in header extension. hdr.setZip64Data(); _out.seekp(hdr.getStartPos(), std::ios_base::beg); - std::string header = hdr.createHeader(); - _out.write(header.c_str(), static_cast(header.size())); + std::string headerString = hdr.createHeader(); + _out.write(headerString.c_str(), static_cast(headerString.size())); _out.seekp(0, std::ios_base::end); } @@ -273,8 +273,8 @@ void Compress::addRecursive(const Poco::Path& entry, ZipCommon::CompressionMetho { Poco::Path realFile(entry, *it); Poco::Path renamedFile(aName, *it); - Poco::File aFile(realFile); - if (aFile.isDirectory()) + Poco::File file(realFile); + if (file.isDirectory()) { realFile.makeDirectory(); renamedFile.makeDirectory(); diff --git a/Zip/src/ZipLocalFileHeader.cpp b/Zip/src/ZipLocalFileHeader.cpp index 64dae2b90..805f60d42 100644 --- a/Zip/src/ZipLocalFileHeader.cpp +++ b/Zip/src/ZipLocalFileHeader.cpp @@ -31,7 +31,7 @@ const char ZipLocalFileHeader::HEADER[ZipCommon::HEADER_SIZE] = {'\x50', '\x4b', ZipLocalFileHeader::ZipLocalFileHeader(const Poco::Path& fileName, - const Poco::DateTime& lastModifiedAt, + const Poco::DateTime& lastModified, ZipCommon::CompressionMethod cm, ZipCommon::CompressionLevel cl, bool forceZip64): @@ -62,7 +62,7 @@ ZipLocalFileHeader::ZipLocalFileHeader(const Poco::Path& fileName, setHostSystem(hs); setEncryption(false); setExtraFieldSize(0); - setLastModifiedAt(lastModifiedAt); + setLastModifiedAt(lastModified); init(fileName, cm, cl); } @@ -197,12 +197,12 @@ bool ZipLocalFileHeader::searchCRCAndSizesAfterData() const } -void ZipLocalFileHeader::setFileName(const std::string& fileName, bool isDirectory) +void ZipLocalFileHeader::setFileName(const std::string& fileName, bool directory) { poco_assert (!fileName.empty()); Poco::Path aPath(fileName); - if (isDirectory) + if (directory) { aPath.makeDirectory(); setCRC(0); @@ -218,7 +218,7 @@ void ZipLocalFileHeader::setFileName(const std::string& fileName, bool isDirecto _fileName = aPath.toString(Poco::Path::PATH_UNIX); if (_fileName[0] == '/') _fileName = _fileName.substr(1); - if (isDirectory) + if (directory) { poco_assert_dbg (_fileName[_fileName.size()-1] == '/'); } diff --git a/Zip/testsuite/src/CompressTest.cpp b/Zip/testsuite/src/CompressTest.cpp index d14a4a959..664c1cf3b 100644 --- a/Zip/testsuite/src/CompressTest.cpp +++ b/Zip/testsuite/src/CompressTest.cpp @@ -28,7 +28,7 @@ using namespace Poco::Zip; -CompressTest::CompressTest(const std::string& name): CppUnit::TestCase(name) +CompressTest::CompressTest(const std::string& rName): CppUnit::TestCase(rName) { } diff --git a/Zip/testsuite/src/PartialStreamTest.cpp b/Zip/testsuite/src/PartialStreamTest.cpp index 619472306..336ab12cb 100644 --- a/Zip/testsuite/src/PartialStreamTest.cpp +++ b/Zip/testsuite/src/PartialStreamTest.cpp @@ -20,7 +20,7 @@ using namespace Poco::Zip; -PartialStreamTest::PartialStreamTest(const std::string& name): CppUnit::TestCase(name) +PartialStreamTest::PartialStreamTest(const std::string& rName): CppUnit::TestCase(rName) { } diff --git a/Zip/testsuite/src/ZipTest.cpp b/Zip/testsuite/src/ZipTest.cpp index 5ef109286..e697290bb 100644 --- a/Zip/testsuite/src/ZipTest.cpp +++ b/Zip/testsuite/src/ZipTest.cpp @@ -35,7 +35,7 @@ using namespace Poco::Zip; -ZipTest::ZipTest(const std::string& name): CppUnit::TestCase(name) +ZipTest::ZipTest(const std::string& rName): CppUnit::TestCase(rName) { }