diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-12-21 11:12:14 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-12-21 11:12:14 -0500 |
| commit | 08ec7524df324e627bbb8d93c509f0d90badbe3b (patch) | |
| tree | a640ae99a5e35b210352150feef4f71832b265c5 /cpp/src/IcePatch2/Util.cpp | |
| parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
| download | ice-08ec7524df324e627bbb8d93c509f0d90badbe3b.tar.bz2 ice-08ec7524df324e627bbb8d93c509f0d90badbe3b.tar.xz ice-08ec7524df324e627bbb8d93c509f0d90badbe3b.zip | |
IceUtil cleanup (first commit)
Diffstat (limited to 'cpp/src/IcePatch2/Util.cpp')
| -rw-r--r-- | cpp/src/IcePatch2/Util.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/IcePatch2/Util.cpp b/cpp/src/IcePatch2/Util.cpp index b7eb1fb8002..b756ab24bb6 100644 --- a/cpp/src/IcePatch2/Util.cpp +++ b/cpp/src/IcePatch2/Util.cpp @@ -17,6 +17,7 @@ #include <IceUtil/DisableWarnings.h> #include <IceUtil/IceUtil.h> +#include <IceUtil/StringUtil.h> #include <IcePatch2/Util.h> #include <openssl/sha.h> #include <bzlib.h> @@ -117,7 +118,7 @@ bool IcePatch2::writeFileInfo(FILE* fp, const FileInfo& info) { int rc = fprintf(fp, "%s\t%s\t%d\t%d\n", - IceUtil::escapeString(info.path, "").c_str(), + IceUtilInternal::escapeString(info.path, "").c_str(), bytesToString(info.checksum).c_str(), info.size, static_cast<int>(info.executable)); @@ -148,7 +149,7 @@ IcePatch2::readFileInfo(FILE* fp, FileInfo& info) string s; getline(is, s, '\t'); - IceUtil::unescapeString(s, 0, s.size(), info.path); + IceUtilInternal::unescapeString(s, 0, s.size(), info.path); getline(is, s, '\t'); info.checksum = stringToBytes(s); |