diff options
| author | Jose <jose@zeroc.com> | 2009-08-12 17:59:22 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2009-08-12 17:59:22 +0200 |
| commit | e33a0af8f6fef372c9f8bec22629b1460d2e8c70 (patch) | |
| tree | 67c9e68437084d255a3725dd08092f5892023b26 /cpp/src/IcePatch2/ClientUtil.cpp | |
| parent | 2564 - removeServantLocator remaining issues. (diff) | |
| download | ice-e33a0af8f6fef372c9f8bec22629b1460d2e8c70.tar.bz2 ice-e33a0af8f6fef372c9f8bec22629b1460d2e8c70.tar.xz ice-e33a0af8f6fef372c9f8bec22629b1460d2e8c70.zip | |
4071 - merge contents of OS.cpp/OS.h into FileUtil.h/FileUtil.cpp.
Diffstat (limited to 'cpp/src/IcePatch2/ClientUtil.cpp')
| -rw-r--r-- | cpp/src/IcePatch2/ClientUtil.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cpp/src/IcePatch2/ClientUtil.cpp b/cpp/src/IcePatch2/ClientUtil.cpp index 364be6b8190..d5f13208698 100644 --- a/cpp/src/IcePatch2/ClientUtil.cpp +++ b/cpp/src/IcePatch2/ClientUtil.cpp @@ -15,7 +15,6 @@ #include <IcePatch2/Util.h> #include <IcePatch2/FileServerI.h> #include <list> -#include <OS.h> #ifdef __BCPLUSPLUS__ # include <iterator> @@ -459,7 +458,7 @@ IcePatch2::Patcher::prepare() sort(_updateFlags.begin(), _updateFlags.end(), FileInfoLess()); string pathLog = simplify(_dataDir + '/' + logFile); - _log = IceInternal::OS::fopen(pathLog, "w"); + _log = IceUtilInternal::fopen(pathLog, "w"); if(!_log) { throw "cannot open `" + pathLog + "' for writing:\n" + IceUtilInternal::lastErrorToString(); @@ -620,7 +619,7 @@ IcePatch2::Patcher::init(const FileServerPrx& server) if(!IceUtilInternal::isAbsolutePath(_dataDir)) { string cwd; - if(IceInternal::OS::getcwd(cwd) != 0) + if(IceUtilInternal::getcwd(cwd) != 0) { throw "cannot get the current directory:\n" + IceUtilInternal::lastErrorToString(); } @@ -823,7 +822,7 @@ IcePatch2::Patcher::updateFilesInternal(const FileInfoSeq& files, const Decompre if(p->size == 0) { string path = simplify(_dataDir + '/' + p->path); - FILE* fp = IceInternal::OS::fopen(path, "wb"); + FILE* fp = IceUtilInternal::fopen(path, "wb"); if(fp == 0) { throw "cannot open `" + path +"' for writing:\n" + IceUtilInternal::lastErrorToString(); @@ -848,7 +847,7 @@ IcePatch2::Patcher::updateFilesInternal(const FileInfoSeq& files, const Decompre { } - FILE* fileBZ2 = IceInternal::OS::fopen(pathBZ2, "wb"); + FILE* fileBZ2 = IceUtilInternal::fopen(pathBZ2, "wb"); if(fileBZ2 == 0) { throw "cannot open `" + pathBZ2 + "' for writing:\n" + IceUtilInternal::lastErrorToString(); |