diff --git a/src/core/fsservices.h b/src/core/fsservices.h index 0aed4c1..f2f4249 100644 --- a/src/core/fsservices.h +++ b/src/core/fsservices.h @@ -241,14 +241,14 @@ class iFSServices //////////////////////////////////////// // major filesystem functions //////////////////////////////////////// - virtual void Stat( const TSTRING& strFileName, cFSStatArgs& pStat ) const throw( eFSServices ) = 0; + virtual void Stat( const TSTRING& strFileName, cFSStatArgs& pStat ) const = 0; // fills out the cFSStatArgs structure with the stat info for the named file - virtual void GetTempDirName( TSTRING& strName ) const throw( eFSServices ) = 0; + virtual void GetTempDirName( TSTRING& strName ) const = 0; // makes directory if it doesn't exist already. Dirname will end with a delimiter ( '/' ) virtual void SetTempDirName( TSTRING& tmpName ) = 0; - virtual TSTRING& MakeTempFilename( TSTRING& strName ) const throw( eFSServices ) = 0; + virtual TSTRING& MakeTempFilename( TSTRING& strName ) const = 0; // create temporary file // TSTRING must have the form ("baseXXXXXX"), where the X's are replaced with // characters to make it a unique file. There must be at least 6 Xs. @@ -259,7 +259,7 @@ class iFSServices //////////////////////////////////////// virtual void GetHostID( TSTRING& name ) const = 0; - virtual void GetMachineName( TSTRING& name ) const throw(eFSServices) = 0; + virtual void GetMachineName( TSTRING& name ) const = 0; virtual void GetMachineNameFullyQualified( TSTRING& name ) const = 0; @@ -271,11 +271,11 @@ class iFSServices //////////////////////////////////////// // directory specific functions //////////////////////////////////////// - virtual void ReadDir( const TSTRING& strName, std::vector &vDirContents, bool bFullPaths = true ) const throw( eFSServices ) = 0; + virtual void ReadDir( const TSTRING& strName, std::vector &vDirContents, bool bFullPaths = true ) const = 0; // puts the contents of the specified directory, except for . and .., into the supplied vector. // if bFullPaths is true, then the vector contains fully qualified path names; otherwise, it only contains the // short names. - virtual void GetCurrentDir( TSTRING& strCurDir ) const throw( eFSServices ) = 0; + virtual void GetCurrentDir( TSTRING& strCurDir ) const = 0; // returns the current working directory diff --git a/src/core/unixfsservices.cpp b/src/core/unixfsservices.cpp index ca6493f..d5b87c0 100644 --- a/src/core/unixfsservices.cpp +++ b/src/core/unixfsservices.cpp @@ -183,10 +183,10 @@ TCHAR cUnixFSServices::GetPathSeparator() const } #if !USES_DEVICE_PATH -void cUnixFSServices::ReadDir(const TSTRING& strFilename, std::vector &v, bool bFullPaths) const throw(eFSServices) +void cUnixFSServices::ReadDir(const TSTRING& strFilename, std::vector &v, bool bFullPaths) const { #else -void cUnixFSServices::ReadDir(const TSTRING& strFilenameC, std::vector& v, bool bFullPaths) const throw(eFSServices) +void cUnixFSServices::ReadDir(const TSTRING& strFilenameC, std::vector& v, bool bFullPaths) const { TSTRING strFilename = cDevicePath::AsNative(strFilenameC); #endif @@ -237,7 +237,7 @@ void cUnixFSServices::ReadDir(const TSTRING& strFilenameC, std::vector& } /* needs to and with S_IFMT, check EQUALITY with S_*, and return more types -cFSStatArgs::FileType cUnixFSServices::GetFileType(const cFCOName &filename) throw(eFSServices) +cFSStatArgs::FileType cUnixFSServices::GetFileType(const cFCOName &filename) { cFSStatArgs stat; Stat(filename, stat); @@ -245,7 +245,7 @@ cFSStatArgs::FileType cUnixFSServices::GetFileType(const cFCOName &filename) thr } */ -void cUnixFSServices::GetCurrentDir( TSTRING& strCurDir ) const throw(eFSServices) +void cUnixFSServices::GetCurrentDir( TSTRING& strCurDir ) const { TCHAR pathname[iFSServices::TW_MAX_PATH]; pathname[0] = '\0'; @@ -258,7 +258,7 @@ void cUnixFSServices::GetCurrentDir( TSTRING& strCurDir ) const throw(eFSService } -TSTRING& cUnixFSServices::MakeTempFilename( TSTRING& strName ) const throw(eFSServices) +TSTRING& cUnixFSServices::MakeTempFilename( TSTRING& strName ) const { char* pchTempFileName; char szTemplate[iFSServices::TW_MAX_PATH]; @@ -295,7 +295,7 @@ TSTRING& cUnixFSServices::MakeTempFilename( TSTRING& strName ) const throw(eFSSe return( strName ); } -void cUnixFSServices::GetTempDirName( TSTRING& strName ) const throw(eFSServices) +void cUnixFSServices::GetTempDirName( TSTRING& strName ) const { strName = mTempPath; } @@ -307,10 +307,10 @@ void cUnixFSServices::SetTempDirName(TSTRING& tmpPath) { #if !USES_DEVICE_PATH -void cUnixFSServices::Stat( const TSTRING& strName, cFSStatArgs &stat ) const throw(eFSServices) +void cUnixFSServices::Stat( const TSTRING& strName, cFSStatArgs &stat ) const { #else -void cUnixFSServices::Stat( const TSTRING& strNameC, cFSStatArgs& stat) const throw(eFSServices) +void cUnixFSServices::Stat( const TSTRING& strNameC, cFSStatArgs& stat) const { TSTRING strName = cDevicePath::AsNative(strNameC); #endif @@ -375,7 +375,7 @@ void cUnixFSServices::Stat( const TSTRING& strNameC, cFSStatArgs& stat) const th else stat.mFileType = cFSStatArgs::TY_INVALID; } -void cUnixFSServices::GetMachineName( TSTRING& strName ) const throw( eFSServices ) +void cUnixFSServices::GetMachineName( TSTRING& strName ) const { #if HAVE_SYS_UTSNAME_H struct utsname namebuf; diff --git a/src/core/unixfsservices.h b/src/core/unixfsservices.h index c0fd1bc..51e6c51 100644 --- a/src/core/unixfsservices.h +++ b/src/core/unixfsservices.h @@ -83,16 +83,16 @@ class cUnixFSServices : public iFSServices //////////////////////////////////////// // major filesystem functions //////////////////////////////////////// - virtual void Stat( const TSTRING& strFileName, cFSStatArgs& pStat ) const throw( eFSServices ); + virtual void Stat( const TSTRING& strFileName, cFSStatArgs& pStat ) const ; // fills out the cFSStatArgs structure with the stat info for the named file - virtual void GetTempDirName( TSTRING& strName ) const throw( eFSServices ); + virtual void GetTempDirName( TSTRING& strName ) const ; // makes directory if it doesn't exist already. Dirname will end with a delimiter ( '/' ) virtual void SetTempDirName(TSTRING& tmpName); // set the default dir name which GetTempDirName will use... - virtual TSTRING& MakeTempFilename( TSTRING& strName ) const throw( eFSServices ); + virtual TSTRING& MakeTempFilename( TSTRING& strName ) const ; // create temporary file // strName must have the form ("baseXXXXXX"), where the X's are replaced with // characters to make it a unique file. There must be at least 6 Xs. @@ -103,7 +103,7 @@ class cUnixFSServices : public iFSServices //////////////////////////////////////// virtual void GetHostID( TSTRING& name ) const; - virtual void GetMachineName( TSTRING& name) const throw(eFSServices); + virtual void GetMachineName( TSTRING& name) const; virtual void GetMachineNameFullyQualified( TSTRING& name ) const; @@ -115,9 +115,9 @@ class cUnixFSServices : public iFSServices //////////////////////////////////////// // directory specific functions //////////////////////////////////////// - virtual void ReadDir( const TSTRING& strName, std::vector &vDirContents, bool bFullPaths = true ) const throw( eFSServices ); + virtual void ReadDir( const TSTRING& strName, std::vector &vDirContents, bool bFullPaths = true ) const; // puts the contents of the specified directory, except for . and .., into the supplied vector. - virtual void GetCurrentDir( TSTRING& strCurDir ) const throw( eFSServices ); + virtual void GetCurrentDir( TSTRING& strCurDir ) const; // returns the current working directory