Remove unused functions in IcePatch2Lib Util.cpp/Util.h

2 files changed, 0 insertions, 78 deletions

diff --git a/cpp/src/IcePatch2Lib/Util.cpp b/cpp/src/IcePatch2Lib/Util.cpp
index 1ce932d977c..a1df441be72 100644
--- a/cpp/src/IcePatch2Lib/Util.cpp
+++ b/cpp/src/IcePatch2Lib/Util.cpp
@@ -81,12 +81,6 @@ IcePatch2Internal::toLargeFileInfo(const FileInfo& info)
 }
 
 bool
-IcePatch2Internal::writeFileInfo(FILE* fp, const FileInfo& info)
-{
-    return writeFileInfo(fp, toLargeFileInfo(info));
-}
-
-bool
 IcePatch2Internal::writeFileInfo(FILE* fp, const LargeFileInfo& info)
 {
     int rc = fprintf(fp, "%s\t%s\t%" ICE_INT64_FORMAT "d\t%d\n", 
@@ -98,18 +92,6 @@ IcePatch2Internal::writeFileInfo(FILE* fp, const LargeFileInfo& info)
 }
 
 bool
-IcePatch2Internal::readFileInfo(FILE* fp, FileInfo& info)
-{
-    LargeFileInfo largeInfo;
-    bool retval = readFileInfo(fp, largeInfo);
-    if(retval)
-    {
-        info = toFileInfo(largeInfo);
-    }
-    return retval;
-}
-
-bool
 IcePatch2Internal::readFileInfo(FILE* fp, LargeFileInfo& info)
 {
     string data;
@@ -746,12 +728,6 @@ IcePatch2Internal::decompressFile(const string& pa)
     fclose(fp);
 }
 
-void
-IcePatch2Internal::setFileFlags(const string& pa, const FileInfo& info)
-{
-    setFileFlags(pa, toLargeFileInfo(info));
-}
-
 #ifndef _WIN32
 void
 IcePatch2Internal::setFileFlags(const string& pa, const LargeFileInfo& info)
@@ -1044,16 +1020,6 @@ getFileInfoSeqInternal(const string& basePath, const string& relPath, int compre
 }
 
 bool
-IcePatch2Internal::getFileInfoSeq(const string& basePath, int compress, GetFileInfoSeqCB* cb, FileInfoSeq& infoSeq)
-{
-    LargeFileInfoSeq largeInfoSeq;
-    bool retval = getFileInfoSeq(basePath, compress, cb, largeInfoSeq);
-    infoSeq.resize(largeInfoSeq.size());
-    transform(largeInfoSeq.begin(), largeInfoSeq.end(), infoSeq.begin(), toFileInfo);
-    return retval;
-}
-
-bool
 IcePatch2Internal::getFileInfoSeq(const string& basePath, int compress, GetFileInfoSeqCB* cb, 
                                   LargeFileInfoSeq& infoSeq)
 {
@@ -1062,17 +1028,6 @@ IcePatch2Internal::getFileInfoSeq(const string& basePath, int compress, GetFileI
 
 bool
 IcePatch2Internal::getFileInfoSeqSubDir(const string& basePa, const string& relPa, int compress, GetFileInfoSeqCB* cb,
-                                        FileInfoSeq& infoSeq)
-{
-    LargeFileInfoSeq largeInfoSeq;
-    bool retval = getFileInfoSeqSubDir(basePa, relPa, compress, cb, largeInfoSeq);
-    infoSeq.resize(largeInfoSeq.size());
-    transform(largeInfoSeq.begin(), largeInfoSeq.end(), infoSeq.begin(), toFileInfo);
-    return retval;
-}
-
-bool
-IcePatch2Internal::getFileInfoSeqSubDir(const string& basePa, const string& relPa, int compress, GetFileInfoSeqCB* cb,
                                         LargeFileInfoSeq& infoSeq)
 {
     const string basePath = simplify(basePa);
@@ -1090,14 +1045,6 @@ IcePatch2Internal::getFileInfoSeqSubDir(const string& basePa, const string& relP
 }
 
 void
-IcePatch2Internal::saveFileInfoSeq(const string& pa, const FileInfoSeq& infoSeq)
-{
-    LargeFileInfoSeq largeInfoSeq(infoSeq.size());
-    transform(infoSeq.begin(), infoSeq.end(), largeInfoSeq.begin(), toLargeFileInfo);
-    saveFileInfoSeq(pa, largeInfoSeq);
-}
-
-void
 IcePatch2Internal::saveFileInfoSeq(const string& pa, const LargeFileInfoSeq& infoSeq)
 {
     {
@@ -1139,15 +1086,6 @@ IcePatch2Internal::saveFileInfoSeq(const string& pa, const LargeFileInfoSeq& inf
 }
 
 void
-IcePatch2Internal::loadFileInfoSeq(const string& pa, FileInfoSeq& infoSeq)
-{
-    LargeFileInfoSeq largeInfoSeq;
-    loadFileInfoSeq(pa, largeInfoSeq);
-    infoSeq.resize(largeInfoSeq.size());
-    transform(largeInfoSeq.begin(), largeInfoSeq.end(), infoSeq.begin(), toFileInfo);
-}
-
-void
 IcePatch2Internal::loadFileInfoSeq(const string& pa, LargeFileInfoSeq& infoSeq)
 {
     {
@@ -1247,14 +1185,6 @@ IcePatch2Internal::loadFileInfoSeq(const string& pa, LargeFileInfoSeq& infoSeq)
 }
 
 void
-IcePatch2Internal::getFileTree0(const FileInfoSeq& infoSeq, FileTree0& tree0)
-{
-    LargeFileInfoSeq largeInfoSeq(infoSeq.size());
-    transform(infoSeq.begin(), infoSeq.end(), largeInfoSeq.begin(), toLargeFileInfo);
-    getFileTree0(largeInfoSeq, tree0);
-}
-
-void
 IcePatch2Internal::getFileTree0(const LargeFileInfoSeq& infoSeq, FileTree0& tree0)
 {
     tree0.nodes.resize(256);
diff --git a/cpp/src/IcePatch2Lib/Util.h b/cpp/src/IcePatch2Lib/Util.h
index 4f243a5d640..1bf849651c0 100644
--- a/cpp/src/IcePatch2Lib/Util.h
+++ b/cpp/src/IcePatch2Lib/Util.h
@@ -49,7 +49,6 @@ ICE_PATCH2_API void createDirectoryRecursive(const std::string&);
 ICE_PATCH2_API void compressBytesToFile(const std::string&, const Ice::ByteSeq&, Ice::Int);
 ICE_PATCH2_API void decompressFile(const std::string&);
 
-ICE_PATCH2_API void setFileFlags(const std::string&, const IcePatch2::FileInfo&);
 ICE_PATCH2_API void setFileFlags(const std::string&, const IcePatch2::LargeFileInfo&);
 
 struct FileInfoEqual : public std::binary_function<const IcePatch2::LargeFileInfo&, const IcePatch2::LargeFileInfo&, bool>
@@ -164,25 +163,19 @@ public:
     virtual bool compress(const std::string&) = 0;
 };
 
-ICE_PATCH2_API bool getFileInfoSeq(const std::string&, int, GetFileInfoSeqCB*, IcePatch2::FileInfoSeq&);
 ICE_PATCH2_API bool getFileInfoSeq(const std::string&, int, GetFileInfoSeqCB*, IcePatch2::LargeFileInfoSeq&);
 
-ICE_PATCH2_API bool getFileInfoSeqSubDir(const std::string&, const std::string&, int, GetFileInfoSeqCB*, IcePatch2::FileInfoSeq&);
 ICE_PATCH2_API bool getFileInfoSeqSubDir(const std::string&, const std::string&, int, GetFileInfoSeqCB*, IcePatch2::LargeFileInfoSeq&);
 
-ICE_PATCH2_API void saveFileInfoSeq(const std::string&, const IcePatch2::FileInfoSeq&);
 ICE_PATCH2_API void saveFileInfoSeq(const std::string&, const IcePatch2::LargeFileInfoSeq&);
 
-ICE_PATCH2_API void loadFileInfoSeq(const std::string&, IcePatch2::FileInfoSeq&);
 ICE_PATCH2_API void loadFileInfoSeq(const std::string&, IcePatch2::LargeFileInfoSeq&);
 
-ICE_PATCH2_API bool readFileInfo(FILE*, IcePatch2::FileInfo&);
 ICE_PATCH2_API bool readFileInfo(FILE*, IcePatch2::LargeFileInfo&);
 
 ICE_PATCH2_API IcePatch2::FileInfo toFileInfo(const IcePatch2::LargeFileInfo&);
 ICE_PATCH2_API IcePatch2::LargeFileInfo toLargeFileInfo(const IcePatch2::FileInfo&);
 
-ICE_PATCH2_API bool writeFileInfo(FILE*, const IcePatch2::FileInfo&);
 ICE_PATCH2_API bool writeFileInfo(FILE*, const IcePatch2::LargeFileInfo&);
 
 struct FileTree1
@@ -199,7 +192,6 @@ struct FileTree0
     Ice::ByteSeq checksum;
 };
 
-ICE_PATCH2_API void getFileTree0(const IcePatch2::FileInfoSeq&, FileTree0&);
 ICE_PATCH2_API void getFileTree0(const IcePatch2::LargeFileInfoSeq&, FileTree0&);
 
 }