diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-12-28 12:43:31 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-30 18:48:24 +0000 |
| commit | a29bd2dabb194c57be28d48ccc08c909831e7e67 (patch) | |
| tree | 4afc38c5b5ad034a8784ae0c0f0317b6d676510d /sal | |
| parent | 97d24068021265e5f159211c90839622f7c87cb2 (diff) | |
cleanup tailing backslashes
Change-Id: Idb4bfc97e7d758c58118742affd9a9345c7a99f2
Reviewed-on: https://gerrit.libreoffice.org/32491
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/file_misc.cxx | 2 | ||||
| -rw-r--r-- | sal/osl/unx/file_path_helper.cxx | 2 | ||||
| -rw-r--r-- | sal/osl/w32/path_helper.cxx | 2 | ||||
| -rw-r--r-- | sal/osl/w32/procimpl.cxx | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx index ce1ec16f9588..ec599a3416b6 100644 --- a/sal/osl/unx/file_misc.cxx +++ b/sal/osl/unx/file_misc.cxx @@ -522,7 +522,7 @@ static oslFileError create_dir_recursively_( oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc, void* pData) { - OSL_PRECOND((rtl_ustr_getLength(dir_path) > 0) && ((dir_path + (rtl_ustr_getLength(dir_path) - 1)) != (dir_path + rtl_ustr_lastIndexOfChar(dir_path, '/'))), \ + OSL_PRECOND((rtl_ustr_getLength(dir_path) > 0) && ((dir_path + (rtl_ustr_getLength(dir_path) - 1)) != (dir_path + rtl_ustr_lastIndexOfChar(dir_path, '/'))), "Path must not end with a slash"); int native_err = create_dir_with_callback( diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx index 8a4a46453b65..587d97ad6453 100644 --- a/sal/osl/unx/file_path_helper.cxx +++ b/sal/osl/unx/file_path_helper.cxx @@ -105,7 +105,7 @@ void SAL_CALL osl_systemPathGetFileNameOrLastDirectoryPart( const rtl_uString* pustrPath, rtl_uString** ppustrFileNameOrLastDirPart) { - OSL_PRECOND(pustrPath && ppustrFileNameOrLastDirPart, \ + OSL_PRECOND(pustrPath && ppustrFileNameOrLastDirPart, "osl_systemPathGetFileNameOrLastDirectoryPart: Invalid parameter"); rtl::OUString path(const_cast<rtl_uString*>(pustrPath)); diff --git a/sal/osl/w32/path_helper.cxx b/sal/osl/w32/path_helper.cxx index a79373d7078e..c778b152270b 100644 --- a/sal/osl/w32/path_helper.cxx +++ b/sal/osl/w32/path_helper.cxx @@ -41,7 +41,7 @@ const rtl::OUString SLASH ("/"); void osl_systemPathEnsureSeparator(/*inout*/ rtl_uString** ppustrPath) { - OSL_PRECOND(ppustrPath && (nullptr != *ppustrPath), \ + OSL_PRECOND(ppustrPath && (nullptr != *ppustrPath), "osl_systemPathEnsureSeparator: Invalid parameter"); rtl::OUString path(*ppustrPath); diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx index 29f766bae7cc..c9883806c2cf 100644 --- a/sal/osl/w32/procimpl.cxx +++ b/sal/osl/w32/procimpl.cxx @@ -69,8 +69,8 @@ namespace /* private */ { bool operator() (const rtl::OUString& lhs, const rtl::OUString& rhs) const { - OSL_ENSURE((lhs.indexOf(NAME_VALUE_SEPARATOR) > -1) && \ - (rhs.indexOf(NAME_VALUE_SEPARATOR) > -1), \ + OSL_ENSURE((lhs.indexOf(NAME_VALUE_SEPARATOR) > -1) && + (rhs.indexOf(NAME_VALUE_SEPARATOR) > -1), "Malformed environment variable"); // Windows compares environment variables uppercase |