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

Chris Sherlock chris.sherlock79 at gmail.com
Sun Jun 18 16:13:58 UTC 2017


 sal/osl/all/signalshared.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit bca760c294c256fcb1fd3649dbf50f61a4bda474
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Mon Jun 12 21:55:38 2017 +1000

    tdf#43157 - osl: convert OSL_ASSERTs to assert in signalshared.cxx
    
    Change-Id: I690ea82e41bb3e632909193550009721360a9f76
    Reviewed-on: https://gerrit.libreoffice.org/38697
    Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>
    Tested-by: Chris Sherlock <chris.sherlock79 at gmail.com>

diff --git a/sal/osl/all/signalshared.cxx b/sal/osl/all/signalshared.cxx
index 6865f0cacbcc..a97dbd8e862c 100644
--- a/sal/osl/all/signalshared.cxx
+++ b/sal/osl/all/signalshared.cxx
@@ -67,7 +67,8 @@ oslSignalAction callSignalHandler(oslSignalInfo* pInfo)
 
 oslSignalHandler SAL_CALL osl_addSignalHandler(oslSignalHandlerFunction handler, void* pData)
 {
-    OSL_ASSERT(handler != nullptr);
+    assert(!handler);
+
     if (!handler)
         return nullptr;
 
@@ -96,7 +97,7 @@ oslSignalHandler SAL_CALL osl_addSignalHandler(oslSignalHandlerFunction handler,
 
 sal_Bool SAL_CALL osl_removeSignalHandler(oslSignalHandler handler)
 {
-    OSL_ASSERT(handler != nullptr);
+    assert(!handler);
 
     if (!bInitSignal)
         bInitSignal = initSignal();


More information about the Libreoffice-commits mailing list