diff options
| author | Marc Laukien <marc@zeroc.com> | 2003-01-04 23:54:52 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2003-01-04 23:54:52 +0000 |
| commit | 516ded9316177b567b71be2d8d23ba0913bde0b0 (patch) | |
| tree | bd882b69603246d33fb183a5d437701834f91ddc /cpp/src/IcePatch/Util.cpp | |
| parent | IcePatch bug fixes (diff) | |
| download | ice-516ded9316177b567b71be2d8d23ba0913bde0b0.tar.bz2 ice-516ded9316177b567b71be2d8d23ba0913bde0b0.tar.xz ice-516ded9316177b567b71be2d8d23ba0913bde0b0.zip | |
IcePatch fixes
Diffstat (limited to 'cpp/src/IcePatch/Util.cpp')
| -rw-r--r-- | cpp/src/IcePatch/Util.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/IcePatch/Util.cpp b/cpp/src/IcePatch/Util.cpp index a413bd55f36..7a68790a3e3 100644 --- a/cpp/src/IcePatch/Util.cpp +++ b/cpp/src/IcePatch/Util.cpp @@ -190,7 +190,7 @@ IcePatch::getFileInfo(const string& path, bool exceptionIfNotExist, const Ice::L { try { - removeRecursive(path + ".md5"); + removeRecursive(path + ".md5", logger); } catch(const FileAccessException&) { @@ -198,7 +198,7 @@ IcePatch::getFileInfo(const string& path, bool exceptionIfNotExist, const Ice::L try { - removeRecursive(path + ".bz2"); + removeRecursive(path + ".bz2", logger); } catch(const FileAccessException&) { @@ -227,12 +227,12 @@ IcePatch::getFileInfo(const string& path, bool exceptionIfNotExist, const Ice::L void IcePatch::removeRecursive(const string& path, const Ice::LoggerPtr& logger) { - if(getFileInfo(path, true).type == FileTypeDirectory) + if(getFileInfo(path, true, logger).type == FileTypeDirectory) { StringSeq paths = readDirectory(path); for(StringSeq::const_iterator p = paths.begin(); p != paths.end(); ++p) { - removeRecursive(*p); + removeRecursive(*p, logger); } #ifdef _WIN32 @@ -443,7 +443,7 @@ IcePatch::createMD5(const string& path, const LoggerPtr& logger) ByteSeq bytes; - FileInfo info = getFileInfo(path, true); + FileInfo info = getFileInfo(path, true, logger); if(info.type == FileTypeDirectory) { // @@ -530,7 +530,7 @@ IcePatch::createMD5(const string& path, const LoggerPtr& logger) } ByteSeq -IcePatch::calcPartialMD5(const string& path, Int size) +IcePatch::calcPartialMD5(const string& path, Int size, const LoggerPtr& logger) { if(size < 0) { @@ -539,7 +539,7 @@ IcePatch::calcPartialMD5(const string& path, Int size) throw ex; } - FileInfo info = getFileInfo(path, true); + FileInfo info = getFileInfo(path, true, logger); if(info.type == FileTypeDirectory) { FileAccessException ex; @@ -660,7 +660,7 @@ IcePatch::getBZ2(const string& path, Int pos, Int num) void IcePatch::createBZ2(const string& path, const Ice::LoggerPtr& logger) { - FileInfo info = getFileInfo(path, true); + FileInfo info = getFileInfo(path, true, logger); if(info.type == FileTypeDirectory) { FileAccessException ex; |