From 70e744b2157ebe48f3a5c839560fedf6521d0464 Mon Sep 17 00:00:00 2001 From: Michaël Lefèvre Date: Mon, 7 Apr 2014 11:44:43 +0200 Subject: fdo#43157 Remove OSL_POSTCOND, prefer SAL_WARN_IF Change-Id: Ia89a2dce799c7ba90bcd19919195bfd2c7a4a180 Signed-off-by: Stephan Bergmann --- sal/osl/unx/file_path_helper.cxx | 8 +++++--- sal/osl/w32/file.cxx | 5 +++-- sal/osl/w32/file_dirvol.cxx | 5 +++-- sal/osl/w32/path_helper.cxx | 3 ++- sal/osl/w32/socket.cxx | 5 +++-- 5 files changed, 16 insertions(+), 10 deletions(-) (limited to 'sal') diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx index 6c8dab15c5b0..ae3781e11eaf 100644 --- a/sal/osl/unx/file_path_helper.cxx +++ b/sal/osl/unx/file_path_helper.cxx @@ -51,8 +51,9 @@ void SAL_CALL osl_systemPathRemoveSeparator(rtl_uString* pustrPath) pustrPath->buffer[pustrPath->length] = (sal_Unicode)'\0'; } - OSL_POSTCOND((0 == pustrPath->length) || (1 == pustrPath->length) || \ - (pustrPath->length > 1 && pustrPath->buffer[pustrPath->length - 1] != FPH_CHAR_PATH_SEPARATOR), \ + SAL_WARN_IF( !((0 == pustrPath->length) || (1 == pustrPath->length) || + (pustrPath->length > 1 && pustrPath->buffer[pustrPath->length - 1] != FPH_CHAR_PATH_SEPARATOR)), + "sal.osl", "osl_systemPathRemoveSeparator: Post condition failed"); } } @@ -72,7 +73,8 @@ void SAL_CALL osl_systemPathEnsureSeparator(rtl_uString** ppustrPath) rtl_uString_assign(ppustrPath, path.pData); } - OSL_POSTCOND(path.endsWith(FPH_PATH_SEPARATOR()), \ + SAL_WARN_IF( !path.endsWith(FPH_PATH_SEPARATOR()), + "sal.osl", "osl_systemPathEnsureSeparator: Post condition failed"); } } diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx index cca336797ae0..d51c243b5a38 100644 --- a/sal/osl/w32/file.cxx +++ b/sal/osl/w32/file.cxx @@ -684,8 +684,9 @@ SAL_CALL osl_createFileHandleFromOSHandle ( if (!(uFlags & osl_File_OpenFlag_Write)) pImpl->m_state &= ~FileHandle_Impl::STATE_WRITEABLE; - OSL_POSTCOND( - (uFlags & osl_File_OpenFlag_Read) || (uFlags & osl_File_OpenFlag_Write), + SAL_WARN_IF( + !((uFlags & osl_File_OpenFlag_Read) || (uFlags & osl_File_OpenFlag_Write)), + "sal.osl", "osl_createFileHandleFromOSHandle(): missing read/write access flags"); return (oslFileHandle)(pImpl); } diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx index 6fb10091333d..2d2c9f6aab58 100644 --- a/sal/osl/w32/file_dirvol.cxx +++ b/sal/osl/w32/file_dirvol.cxx @@ -166,8 +166,9 @@ namespace /* private */ } } - OSL_POSTCOND(puncc->server_.isPresent() && puncc->share_.isPresent(), \ - "Postcondition violated: Invalid UNC path detected"); + SAL_WARN_IF(!puncc->server_.isPresent() || !puncc->share_.isPresent(), + "sal.osl", + "Postcondition violated: Invalid UNC path detected"); } void parse_UNC_path(const rtl::OUString& path, UNCComponents* puncc) diff --git a/sal/osl/w32/path_helper.cxx b/sal/osl/w32/path_helper.cxx index 14ee0efed5bc..2887860f753a 100644 --- a/sal/osl/w32/path_helper.cxx +++ b/sal/osl/w32/path_helper.cxx @@ -53,7 +53,8 @@ void osl_systemPathEnsureSeparator(/*inout*/ rtl_uString** ppustrPath) rtl_uString_assign(ppustrPath, path.pData); } - OSL_POSTCOND(path.endsWith(BACKSLASH), \ + SAL_WARN_IF( !path.endsWith(BACKSLASH), + "sal.osl", "osl_systemPathEnsureSeparator: Post condition failed"); } diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx index 881c4677151c..d215ff878c0e 100644 --- a/sal/osl/w32/socket.cxx +++ b/sal/osl/w32/socket.cxx @@ -1314,8 +1314,9 @@ oslSocketResult SAL_CALL osl_connectSocketTo ( if (error > 0) /* connected */ { - OSL_POSTCOND( - FD_ISSET(pSocket->m_Socket, &fds), + SAL_WARN_IF( + !FD_ISSET(pSocket->m_Socket, &fds), + "sal.osl", "osl_connectSocketTo(): select returned but socket not set\n"); Result= osl_Socket_Ok; -- cgit