diff options
Diffstat (limited to 'tools/source/fsys')
-rw-r--r-- | tools/source/fsys/comdep.hxx | 10 | ||||
-rw-r--r-- | tools/source/fsys/dirent.cxx | 60 | ||||
-rw-r--r-- | tools/source/fsys/tdir.cxx | 4 | ||||
-rw-r--r-- | tools/source/fsys/tempfile.cxx | 3 | ||||
-rw-r--r-- | tools/source/fsys/unx.cxx | 5 | ||||
-rw-r--r-- | tools/source/fsys/urlobj.cxx | 15 |
6 files changed, 47 insertions, 50 deletions
diff --git a/tools/source/fsys/comdep.hxx b/tools/source/fsys/comdep.hxx index 6e730fb649c3..eae34a378555 100644 --- a/tools/source/fsys/comdep.hxx +++ b/tools/source/fsys/comdep.hxx @@ -51,8 +51,8 @@ struct DirReader_Impl DirEntry* pParent; String aPath; rtl::OString aBypass; - sal_Bool bReady; - sal_Bool bInUse; + sal_Bool bReady; + sal_Bool bInUse; DirReader_Impl( Dir &rDir ) : pDir( &rDir ), @@ -83,9 +83,9 @@ struct DirReader_Impl ~DirReader_Impl() { if( pDosDir ) closedir( pDosDir ); } - // Init and Read are system-independent - sal_uInt16 Init(); // initializes (and if necessary reads devices) - sal_uInt16 Read(); // Reads one entry and appends it if ok + // Init and Read are system-independent + sal_uInt16 Init(); // Initializes (and if necessary) reads devices + sal_uInt16 Read(); // Reads one entry and appends it if ok }; diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx index 3f5cc76c9fb0..8a729cc1a692 100644 --- a/tools/source/fsys/dirent.cxx +++ b/tools/source/fsys/dirent.cxx @@ -64,36 +64,36 @@ int Sys2SolarError_Impl( int nSysErr ) switch ( nSysErr ) { #ifdef WNT - case NO_ERROR: return ERRCODE_NONE; - case ERROR_INVALID_FUNCTION: return ERRCODE_IO_GENERAL; - case ERROR_FILE_NOT_FOUND: return ERRCODE_IO_NOTEXISTS; - case ERROR_PATH_NOT_FOUND: return ERRCODE_IO_NOTEXISTSPATH; - case ERROR_TOO_MANY_OPEN_FILES: return ERRCODE_IO_TOOMANYOPENFILES; - case ERROR_ACCESS_DENIED: return ERRCODE_IO_ACCESSDENIED; - case ERROR_INVALID_HANDLE: return ERRCODE_IO_GENERAL; - case ERROR_NOT_ENOUGH_MEMORY: return ERRCODE_IO_OUTOFMEMORY; - case ERROR_INVALID_BLOCK: return ERRCODE_IO_GENERAL; - case ERROR_BAD_FORMAT: return ERRCODE_IO_WRONGFORMAT; - case ERROR_INVALID_ACCESS: return ERRCODE_IO_ACCESSDENIED; - case ERROR_INVALID_DRIVE: return ERRCODE_IO_INVALIDDEVICE; - case ERROR_CURRENT_DIRECTORY: return ERRCODE_IO_CURRENTDIR; - case ERROR_NOT_SAME_DEVICE: return ERRCODE_IO_NOTSAMEDEVICE; - case ERROR_WRITE_PROTECT: return ERRCODE_IO_CANTWRITE; - case ERROR_BAD_UNIT: return ERRCODE_IO_INVALIDDEVICE; - case ERROR_NOT_READY: return ERRCODE_IO_DEVICENOTREADY; - case ERROR_BAD_COMMAND: return ERRCODE_IO_GENERAL; - case ERROR_CRC: return ERRCODE_IO_BADCRC; - case ERROR_BAD_LENGTH: return ERRCODE_IO_INVALIDLENGTH; - case ERROR_SEEK: return ERRCODE_IO_CANTSEEK; - case ERROR_NOT_DOS_DISK: return ERRCODE_IO_WRONGFORMAT; - case ERROR_SECTOR_NOT_FOUND: return ERRCODE_IO_GENERAL; - case ERROR_WRITE_FAULT: return ERRCODE_IO_CANTWRITE; - case ERROR_READ_FAULT: return ERRCODE_IO_CANTREAD; - case ERROR_GEN_FAILURE: return ERRCODE_IO_GENERAL; - case ERROR_SHARING_VIOLATION: return ERRCODE_IO_LOCKVIOLATION; - case ERROR_LOCK_VIOLATION: return ERRCODE_IO_LOCKVIOLATION; - case ERROR_WRONG_DISK: return ERRCODE_IO_INVALIDDEVICE; - case ERROR_NOT_SUPPORTED: return ERRCODE_IO_NOTSUPPORTED; + case NO_ERROR: return ERRCODE_NONE; + case ERROR_INVALID_FUNCTION: return ERRCODE_IO_GENERAL; + case ERROR_FILE_NOT_FOUND: return ERRCODE_IO_NOTEXISTS; + case ERROR_PATH_NOT_FOUND: return ERRCODE_IO_NOTEXISTSPATH; + case ERROR_TOO_MANY_OPEN_FILES: return ERRCODE_IO_TOOMANYOPENFILES; + case ERROR_ACCESS_DENIED: return ERRCODE_IO_ACCESSDENIED; + case ERROR_INVALID_HANDLE: return ERRCODE_IO_GENERAL; + case ERROR_NOT_ENOUGH_MEMORY: return ERRCODE_IO_OUTOFMEMORY; + case ERROR_INVALID_BLOCK: return ERRCODE_IO_GENERAL; + case ERROR_BAD_FORMAT: return ERRCODE_IO_WRONGFORMAT; + case ERROR_INVALID_ACCESS: return ERRCODE_IO_ACCESSDENIED; + case ERROR_INVALID_DRIVE: return ERRCODE_IO_INVALIDDEVICE; + case ERROR_CURRENT_DIRECTORY: return ERRCODE_IO_CURRENTDIR; + case ERROR_NOT_SAME_DEVICE: return ERRCODE_IO_NOTSAMEDEVICE; + case ERROR_WRITE_PROTECT: return ERRCODE_IO_CANTWRITE; + case ERROR_BAD_UNIT: return ERRCODE_IO_INVALIDDEVICE; + case ERROR_NOT_READY: return ERRCODE_IO_DEVICENOTREADY; + case ERROR_BAD_COMMAND: return ERRCODE_IO_GENERAL; + case ERROR_CRC: return ERRCODE_IO_BADCRC; + case ERROR_BAD_LENGTH: return ERRCODE_IO_INVALIDLENGTH; + case ERROR_SEEK: return ERRCODE_IO_CANTSEEK; + case ERROR_NOT_DOS_DISK: return ERRCODE_IO_WRONGFORMAT; + case ERROR_SECTOR_NOT_FOUND: return ERRCODE_IO_GENERAL; + case ERROR_WRITE_FAULT: return ERRCODE_IO_CANTWRITE; + case ERROR_READ_FAULT: return ERRCODE_IO_CANTREAD; + case ERROR_GEN_FAILURE: return ERRCODE_IO_GENERAL; + case ERROR_SHARING_VIOLATION: return ERRCODE_IO_LOCKVIOLATION; + case ERROR_LOCK_VIOLATION: return ERRCODE_IO_LOCKVIOLATION; + case ERROR_WRONG_DISK: return ERRCODE_IO_INVALIDDEVICE; + case ERROR_NOT_SUPPORTED: return ERRCODE_IO_NOTSUPPORTED; #else case 0: return ERRCODE_NONE; case ENOENT: return ERRCODE_IO_NOTEXISTS; diff --git a/tools/source/fsys/tdir.cxx b/tools/source/fsys/tdir.cxx index f2c71b7b5053..f96c50272f7f 100644 --- a/tools/source/fsys/tdir.cxx +++ b/tools/source/fsys/tdir.cxx @@ -30,8 +30,8 @@ DBG_NAME( Dir ) /// determines whether insertion is required sal_Bool Dir::ImpInsertPointReached( const DirEntry& rNewEntry, - const FileStat& rNewStat, - size_t nCurPos, size_t nSortIndex ) const + const FileStat& rNewStat, + size_t nCurPos, size_t nSortIndex ) const { #define VALUE( nKindFlags ) \ ( ( FSYS_KIND_FILE | FSYS_KIND_DIR | FSYS_KIND_DEV | \ diff --git a/tools/source/fsys/tempfile.cxx b/tools/source/fsys/tempfile.cxx index c23be81de494..7a3f9dfc2f0a 100644 --- a/tools/source/fsys/tempfile.cxx +++ b/tools/source/fsys/tempfile.cxx @@ -177,7 +177,8 @@ TempFile::TempFile( const String* pParent, sal_Bool bDirectory ) CreateTempName_Impl( pImp->aName, sal_True, bDirectory ); } -TempFile::TempFile( const String& rLeadingChars, const String* pExtension, const String* pParent, sal_Bool bDirectory ) +TempFile::TempFile( const String& rLeadingChars, const String* pExtension, + const String* pParent, sal_Bool bDirectory ) : pImp( new TempFile_Impl ) , bKillingFileEnabled( sal_False ) { diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx index 7accaff20810..00472a5bcd78 100644 --- a/tools/source/fsys/unx.cxx +++ b/tools/source/fsys/unx.cxx @@ -194,7 +194,7 @@ namespace { struct mymnt : public rtl::Static< mymnttab, mymnt > {}; } String DirEntry::GetVolume() const { - DBG_CHKTHIS( DirEntry, ImpCheckDirEntry ); + DBG_CHKTHIS( DirEntry, ImpCheckDirEntry ); DirEntry aPath( *this ); aPath.ToAbs(); @@ -207,8 +207,7 @@ String DirEntry::GetVolume() const aPath = aPath [1]; } mymnttab &rMnt = mymnt::get(); - return ((buf.st_dev == rMnt.mountdevice || - GetMountEntry(buf.st_dev, &rMnt)) ? + return ((buf.st_dev == rMnt.mountdevice || GetMountEntry(buf.st_dev, &rMnt)) ? rtl::OStringToOUString(rMnt.mountspecial, osl_getThreadTextEncoding()) : rtl::OUString()); } diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 3924130476f9..428d4e078e60 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -585,10 +585,9 @@ void INetURLObject::setInvalid() namespace unnamed_tools_urlobj { -INetURLObject::FSysStyle -guessFSysStyleByCounting(sal_Unicode const * pBegin, - sal_Unicode const * pEnd, - INetURLObject::FSysStyle eStyle) +INetURLObject::FSysStyle guessFSysStyleByCounting(sal_Unicode const * pBegin, + sal_Unicode const * pEnd, + INetURLObject::FSysStyle eStyle) { DBG_ASSERT(eStyle & (INetURLObject::FSYS_UNX @@ -2101,9 +2100,8 @@ bool INetURLObject::convertExtToInt(rtl::OUString const & rTheExtURIRef, } // static -INetURLObject::PrefixInfo const * -INetURLObject::getPrefix(sal_Unicode const *& rBegin, - sal_Unicode const * pEnd) +INetURLObject::PrefixInfo const * INetURLObject::getPrefix(sal_Unicode const *& rBegin, + sal_Unicode const * pEnd) { static PrefixInfo const aMap[] = { // dummy entry at front needed, because pLast may point here: @@ -2384,8 +2382,7 @@ bool INetURLObject::setPassword(rtl::OUString const & rThePassword, } // static -bool INetURLObject::parseHost( - sal_Unicode const *& rBegin, sal_Unicode const * pEnd, +bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * pEnd, rtl::OUString & rCanonic) { // RFC 2373 is inconsistent about how to write an IPv6 address in which an |