sal/osl/unx/file_url.cxx | 4 ++-- sal/osl/unx/file_url.hxx | 2 +- sal/osl/unx/tempfile.cxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 72582e9fb3d634a28c1466126bbe8e36fc00b446 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Mon May 23 09:33:51 2022 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Mon May 23 17:26:15 2022 +0200 rename osl_getSystemPathFromFileURL_Ex->getSystemPathFromFileURL_Ex so I can more readily distinguish between functions that are actually in the OSL API and functions that are not Change-Id: Ie113c30ea15d05457633396d56bca08057e38b60 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134800 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx index 2e21684eba8f..4b5a16885cb3 100644 --- a/sal/osl/unx/file_url.cxx +++ b/sal/osl/unx/file_url.cxx @@ -444,7 +444,7 @@ oslFileError SAL_CALL osl_getFileURLFromSystemPath( rtl_uString *ustrSystemPath, /* * relative URLs are not accepted */ -oslFileError osl_getSystemPathFromFileURL_Ex( +oslFileError getSystemPathFromFileURL_Ex( rtl_uString *ustrFileURL, rtl_uString **pustrSystemPath) { rtl_uString* temp = nullptr; @@ -711,7 +711,7 @@ oslFileError osl_getAbsoluteFileURL( if (systemPathIsRelativePath(unresolved_path)) { OUString base_path; - oslFileError rc = osl_getSystemPathFromFileURL_Ex(ustrBaseDirURL, &base_path.pData); + oslFileError rc = getSystemPathFromFileURL_Ex(ustrBaseDirURL, &base_path.pData); if (rc != osl_File_E_None) return rc; diff --git a/sal/osl/unx/file_url.hxx b/sal/osl/unx/file_url.hxx index f9f31eb2056a..3ffd9e06bace 100644 --- a/sal/osl/unx/file_url.hxx +++ b/sal/osl/unx/file_url.hxx @@ -27,7 +27,7 @@ namespace rtl { class OUString; } -oslFileError osl_getSystemPathFromFileURL_Ex(rtl_uString *ustrFileURL, rtl_uString **pustrSystemPath); +oslFileError getSystemPathFromFileURL_Ex(rtl_uString *ustrFileURL, rtl_uString **pustrSystemPath); oslFileError FileURLToPath(char * buffer, size_t bufLen, rtl_uString* ustrFileURL); diff --git a/sal/osl/unx/tempfile.cxx b/sal/osl/unx/tempfile.cxx index 00ae0664b2c0..bd8e88db742c 100644 --- a/sal/osl/unx/tempfile.cxx +++ b/sal/osl/unx/tempfile.cxx @@ -127,7 +127,7 @@ static oslFileError osl_setup_base_directory_impl_( if (error == osl_File_E_None) { - error = osl_getSystemPathFromFileURL_Ex(dir_url, &dir); + error = getSystemPathFromFileURL_Ex(dir_url, &dir); rtl_uString_release(dir_url); }