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

[Stephan Bergmann]

 sal/osl/w32/file_url.cxx |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 56638d1a6d9baebfe27cbf82ccf0376926c6a530
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri May 12 15:50:44 2017 +0200

    BOOL -> bool
    
    Change-Id: I0cb5f19369ec5f61660a598288fd23700f5d4159
    Reviewed-on: https://gerrit.libreoffice.org/37719
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
index d45cbda1e93b..84f8bb612b32 100644
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -44,12 +44,12 @@
 
 oslMutex g_CurrentDirectoryMutex = nullptr; /* Initialized in dllentry.c */
 
-static BOOL IsValidFilePathComponent(
+static bool IsValidFilePathComponent(
     LPCWSTR lpComponent, LPCWSTR *lppComponentEnd, DWORD dwFlags)
 {
         LPCWSTR lpComponentEnd = nullptr;
         LPCWSTR lpCurrent = lpComponent;
-        BOOL    fValid = TRUE;  /* Assume success */
+        bool    fValid = true;  /* Assume success */
         WCHAR   cLast = 0;
 
         /* Path component length must not exceed MAX_PATH even if long path with "\\?\" prefix is used */
@@ -91,7 +91,7 @@ static BOOL IsValidFilePathComponent(
                     else
                     {
                         lpComponentEnd = lpCurrent - 1;
-                        fValid = FALSE;
+                        fValid = false;
                     }
                     break;
                 default:
@@ -112,14 +112,14 @@ static BOOL IsValidFilePathComponent(
             case '|':
             case ':':
                 lpComponentEnd = lpCurrent;
-                fValid = FALSE;
+                fValid = false;
                 break;
             default:
                 /* Characters below ASCII 32 are not allowed */
                 if ( *lpCurrent < ' ' )
                 {
                     lpComponentEnd = lpCurrent;
-                    fValid = FALSE;
+                    fValid = false;
                 }
                 break;
             }
@@ -130,7 +130,7 @@ static BOOL IsValidFilePathComponent(
             ( See condition of while loop ) */
         if ( !lpComponentEnd )
         {
-            fValid = FALSE;
+            fValid = false;
             lpComponentEnd = lpCurrent;
         }
 
@@ -138,7 +138,7 @@ static BOOL IsValidFilePathComponent(
         {
             // Empty components are not allowed
             if ( lpComponentEnd - lpComponent < 1 )
-                fValid = FALSE;
+                fValid = false;
 
             // If we reached the end of the string nullptr is returned
             else if ( !*lpComponentEnd )
@@ -158,7 +158,7 @@ DWORD IsValidFilePath(rtl_uString *path, DWORD dwFlags, rtl_uString **corrected)
 {
         LPCWSTR lpszPath = SAL_W(path->buffer);
         LPCWSTR lpComponent = lpszPath;
-        BOOL    fValid = TRUE;
+        bool    fValid = true;
         DWORD   dwPathType = PATHTYPE_ERROR;
         sal_Int32 nLength = rtl_uString_getLength( path );
 
@@ -166,7 +166,7 @@ DWORD IsValidFilePath(rtl_uString *path, DWORD dwFlags, rtl_uString **corrected)
             dwFlags |= VALIDATEPATH_ALLOW_ELLIPSE;
 
         if ( !lpszPath )
-            fValid = FALSE;
+            fValid = false;
 
         DWORD   dwCandidatPathType = PATHTYPE_ERROR;
 
@@ -238,7 +238,7 @@ DWORD IsValidFilePath(rtl_uString *path, DWORD dwFlags, rtl_uString **corrected)
             if ( 1 == _tcsspn( lpComponent, CHARSET_SEPARATOR ) )
                 lpComponent++;
             else if ( *lpComponent )
-                fValid = FALSE;
+                fValid = false;
 
             dwPathType = dwCandidatPathType;
 
@@ -269,7 +269,7 @@ DWORD IsValidFilePath(rtl_uString *path, DWORD dwFlags, rtl_uString **corrected)
         else
         {
             /* Anything else is an error */
-            fValid = FALSE;
+            fValid = false;
             lpComponent = lpszPath;
         }
 
@@ -301,7 +301,7 @@ DWORD IsValidFilePath(rtl_uString *path, DWORD dwFlags, rtl_uString **corrected)
         /* The path can be longer than MAX_PATH only in case it has the longpath prefix */
         if ( fValid && !( dwPathType &  PATHTYPE_IS_LONGPATH ) && _tcslen( lpszPath ) >= MAX_PATH )
         {
-            fValid = FALSE;
+            fValid = false;
         }
 
         return fValid ? dwPathType : PATHTYPE_ERROR;