[Libreoffice-commits] core.git: sal/osl

[Chris Sherlock]

 sal/osl/w32/file_dirvol.cxx |   22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

New commits:
commit 191893bc8751f56c93bd65d2ce39b0bbd8e97914
Author: Chris Sherlock <chris.sherloc...@gmail.com>
Date:   Sat Jul 22 19:43:56 2017 +1000

    osl: remove extraneous comments from w32/file_dirvold.cxx
    
    Change-Id: I21a0ce806f64582a62b9ff0e30a2299d1f478ffc

diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index ff1e037e46a7..7e75d4922c60 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -104,7 +104,7 @@ BOOL FileTimeToTimeValue(const FILETIME *cpFTime, TimeValue 
*pTimeVal)
     return fSuccess;
 }
 
-namespace /* private */
+namespace
 {
 
     struct Component
@@ -189,9 +189,7 @@ namespace /* private */
     inline bool has_path_parent(const rtl::OUString& path)
     { return has_path_parent(path.getStr()); }
 
-} // end namespace private
-
-// volume handling functions
+}
 
 oslFileError SAL_CALL osl_acquireVolumeDeviceHandle( oslVolumeDeviceHandle 
Handle )
 {
@@ -226,8 +224,6 @@ oslFileError SAL_CALL osl_getVolumeDeviceMountPath( 
oslVolumeDeviceHandle Handle
         return osl_File_E_INVAL;
 }
 
-// directory handling functions
-
 #define DIRECTORYITEM_DRIVE     0
 #define DIRECTORYITEM_FILE      1
 #define DIRECTORYITEM_SERVER    2
@@ -1154,8 +1150,6 @@ SAL_CALL osl_identicalDirectoryItem( oslDirectoryItem a, 
oslDirectoryItem b)
     return false;
 }
 
-// volume / file info handling functions
-
 static inline bool is_floppy_A_present()
 { return (GetLogicalDrives() & 1); }
 
@@ -1554,14 +1548,6 @@ static oslFileError SAL_CALL osl_getServerInfo(
         return osl_File_E_INVAL;
 
     pStatus->uValidFields = 0;
-
-    //  pStatus->uValidFields |= osl_FileStatus_Mask_FileName;
-
-    //  if ( _tcscmp( pItemImpl->FindData.cFileName, TEXT(".") ) == 0 )
-    //      rtl_uString_newFromAscii( &pStatus->ustrFileName, "/" );
-    //  else
-    //      rtl_uString_newFromStr( &pStatus->ustrFileName, 
pItemImpl->FindData.cFileName );
-
     pStatus->eType = osl_File_Type_Directory;
     pStatus->uValidFields |= osl_FileStatus_Mask_Type;
 
@@ -1690,8 +1676,6 @@ oslFileError SAL_CALL osl_getFileStatus(
     return osl_File_E_None;
 }
 
-// file attributes handling functions
-
 oslFileError SAL_CALL osl_setFileAttributes(
     rtl_uString *ustrFileURL,
     sal_uInt64 uAttributes )
@@ -1722,7 +1706,9 @@ oslFileError SAL_CALL osl_setFileAttributes(
         fSuccess = SetFileAttributes( SAL_W(rtl_uString_getStr(ustrSysPath)), 
dwFileAttributes );
     }
     else
+    {
         fSuccess = FALSE;
+    }
 
     if ( !fSuccess )
         error = oslTranslateFileError( GetLastError() );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits