diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-05-15 10:37:56 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-05-15 12:36:20 +0200 |
| commit | 514ccf73068b6e3b976304752451653a0d179e87 (patch) | |
| tree | f2b1fc2b60c563000b02d04f862c0ab66e53fad2 /sal | |
| parent | 2fbcdd3e551710c8fcbe15d28b7b71f8d038d9ad (diff) | |
coverity#1408971 Mixing enum types
Change-Id: I30c46f2bd8a0ae059722f60a3103e5c7883d6a2d
Reviewed-on: https://gerrit.libreoffice.org/37630
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/file_url.cxx | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx index 8b4eb69c752a..6e80f9778515 100644 --- a/sal/osl/unx/file_url.cxx +++ b/sal/osl/unx/file_url.cxx @@ -590,21 +590,18 @@ oslFileError osl_getAbsoluteFileURL( else if (relUrl.startsWith("/")) relUrl = "file://" + relUrl; - FileBase::RC rc; rtl::OUString unresolved_path; - rc = FileBase::getSystemPathFromFileURL(relUrl, unresolved_path); - - if (rc != FileBase::E_None) - return oslFileError(rc); + FileBase::RC frc = FileBase::getSystemPathFromFileURL(relUrl, unresolved_path); + if (frc != FileBase::E_None) + return oslFileError(frc); if (systemPathIsRelativePath(unresolved_path)) { rtl::OUString base_path; - rc = (FileBase::RC) osl_getSystemPathFromFileURL_Ex(ustrBaseDirURL, &base_path.pData); - - if (rc != FileBase::E_None) - return oslFileError(rc); + oslFileError rc = osl_getSystemPathFromFileURL_Ex(ustrBaseDirURL, &base_path.pData); + if (rc != osl_File_E_None) + return rc; rtl::OUString abs_path; systemPathMakeAbsolutePath(base_path, unresolved_path, abs_path); @@ -613,14 +610,14 @@ oslFileError osl_getAbsoluteFileURL( } rtl::OUString resolved_path; - rc = (FileBase::RC) osl_getAbsoluteFileURL_impl_(unresolved_path, resolved_path); - if (rc == FileBase::E_None) + oslFileError rc = osl_getAbsoluteFileURL_impl_(unresolved_path, resolved_path); + if (rc == osl_File_E_None) { - rc = (FileBase::RC) osl_getFileURLFromSystemPath(resolved_path.pData, pustrAbsoluteURL); - OSL_ASSERT(FileBase::E_None == rc); + rc = osl_getFileURLFromSystemPath(resolved_path.pData, pustrAbsoluteURL); + OSL_ASSERT(osl_File_E_None == rc); } - return oslFileError(rc); + return rc; } namespace osl { |