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

[Stephan Bergmann]

 sal/osl/w32/file_url.cxx |    8 ++++----
 sal/osl/w32/file_url.hxx |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit ffb1d4ea965c83651dc4086ae94a031916959a8a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri May 12 16:59:23 2017 +0200

    Fix integer types
    
    Change-Id: Ia2dc32929da789622ed98764944d4e412a296639
    Reviewed-on: https://gerrit.libreoffice.org/37723
    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 625dfd274add..72eb6ea8afb3 100644
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -346,13 +346,13 @@ static sal_Int32 PathRemoveFileSpec(LPWSTR lpPath, LPWSTR lpFileName, sal_Int32
 }
 
 // Undocumented in SHELL32.DLL ordinal 32
-static LPWSTR PathAddBackslash(LPWSTR lpPath, sal_Int32 nBufLen)
+static LPWSTR PathAddBackslash(LPWSTR lpPath, sal_uInt32 nBufLen)
 {
     LPWSTR  lpEndPath = nullptr;
 
     if ( lpPath )
     {
-            int     nLen = _tcslen(lpPath);
+            std::size_t nLen = _tcslen(lpPath);
 
             if ( !nLen || ( lpPath[nLen-1] != '\\' && lpPath[nLen-1] != '/' && nLen < nBufLen - 1 ) )
             {
@@ -367,7 +367,7 @@ static LPWSTR PathAddBackslash(LPWSTR lpPath, sal_Int32 nBufLen)
 // Same as GetLongPathName but also 95/NT4
 static DWORD GetCaseCorrectPathNameEx(
     LPWSTR  lpszPath,   // path buffer to convert
-    DWORD   cchBuffer,      // size of path buffer
+    sal_uInt32 cchBuffer,      // size of path buffer
     DWORD   nSkipLevels,
     bool bCheckExistence )
 {
@@ -452,7 +452,7 @@ static DWORD GetCaseCorrectPathNameEx(
 DWORD GetCaseCorrectPathName(
     LPCWSTR lpszShortPath,  // file name
     LPWSTR  lpszLongPath,   // path buffer
-    DWORD   cchBuffer,      // size of path buffer
+    sal_uInt32 cchBuffer,      // size of path buffer
     bool bCheckExistence
 )
 {
diff --git a/sal/osl/w32/file_url.hxx b/sal/osl/w32/file_url.hxx
index d90d05840f50..e17351df002c 100644
--- a/sal/osl/w32/file_url.hxx
+++ b/sal/osl/w32/file_url.hxx
@@ -61,7 +61,7 @@ DWORD IsValidFilePath (
 DWORD GetCaseCorrectPathName (
     LPCWSTR lpszShortPath,  // file name
     LPWSTR  lpszLongPath,   // path buffer
-    DWORD   cchBuffer,      // size of path buffer
+    sal_uInt32 cchBuffer,      // size of path buffer
     bool bCheckExistence
 );