diff --git a/src/core/archive.cpp b/src/core/archive.cpp index d0f3310..45e388e 100644 --- a/src/core/archive.cpp +++ b/src/core/archive.cpp @@ -51,28 +51,6 @@ #include "corestrings.h" // for: STR_ERR2_ARCH_CRYPTO_ERR -//============================================================================= -// Utility Functions -//============================================================================= - -/////////////////////////////////////////////////////////////////////////////// -// util_IsDir -- returns true if a given file is a directory -/////////////////////////////////////////////////////////////////////////////// -bool util_IsDir( const TSTRING& fileName ) -{ - cFSStatArgs s; - try - { - iFSServices::GetInstance()->Stat( fileName, s ); - } - catch( eFSServices ) - { - return false; - } - - return( s.mFileType == cFSStatArgs::TY_DIR ); -} - //============================================================================= // eArchiveCrypto //============================================================================= diff --git a/src/core/cmdlineparser.cpp b/src/core/cmdlineparser.cpp index 3030a2c..4ddc30d 100644 --- a/src/core/cmdlineparser.cpp +++ b/src/core/cmdlineparser.cpp @@ -78,14 +78,14 @@ void cCmdLineParser::AddArg(int argId, const TSTRING& arg, const TSTRING& alias, /////////////////////////////////////////////////////////////////////////////// // Clear /////////////////////////////////////////////////////////////////////////////// -void cCmdLineParser::Clear() +/*void cCmdLineParser::Clear() { mLastArgInfo.mId = -1; mLastArgInfo.mNumParams = PARAM_INVALID; mArgTable.Clear(); mArgData.clear(); mMutExList.clear(); -} +}*/ /////////////////////////////////////////////////////////////////////////////// // Parse diff --git a/src/core/cmdlineparser.h b/src/core/cmdlineparser.h index 43105f4..b9d0a40 100644 --- a/src/core/cmdlineparser.h +++ b/src/core/cmdlineparser.h @@ -132,7 +132,7 @@ public: // the input was invalid in some way; the actual error can be determined by calling // GetErrorInfo() below. - void Clear(); +// void Clear(); // clear out all information that this class contains bool LookupArgInfo(int argId, TSTRING& arg, TSTRING& alias) const; diff --git a/src/core/stringutil.h b/src/core/stringutil.h index 43c189a..003e035 100644 --- a/src/core/stringutil.h +++ b/src/core/stringutil.h @@ -114,6 +114,7 @@ namespace cStringUtil wc16_string TstrToWstr( const TSTRING& tstr ); // convert a TSTRING to a wc16_string + template void splitstring(IterT& iter, const TSTRING& str, @@ -146,7 +147,7 @@ namespace cStringUtil }//cStringUtil:: - +/* //----------------------------------------------------------------------------- // push_back_string // @@ -199,7 +200,7 @@ namespace std } }; } - +*/ #endif//__STRINGUTIL_H diff --git a/src/tw/twutil.cpp b/src/tw/twutil.cpp index 96214cd..5bcdb39 100644 --- a/src/tw/twutil.cpp +++ b/src/tw/twutil.cpp @@ -64,20 +64,17 @@ #include "tw/twerrors.h" #include "core/ntmbs.h" #include "core/displayencoder.h" +#include "core/tw_signal.h" #ifdef TW_PROFILE #include "core/tasktimer.h" #endif -#include "core/fsservices.h" // for the util_IsDir() stuff - #include #include #if SUPPORTS_TERMIOS # include # include - -#include "core/tw_signal.h" int _getch(void); #endif