[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/unx

Jan-Marek Glogowski glogow at fbihome.de
Thu Aug 27 03:02:26 PDT 2015


 vcl/unx/kde4/tst_exclude_socket_notifiers.hxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ecb577d0270821cd775656e4aeb5c295a2a6c1d5
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Wed Aug 26 16:30:26 2015 +0000

    KDE4: don't ignore write(2) return value
    
    Silence the glibc compile warning and actually handle a wrong
    return value.
    
    Change-Id: Icdbc8e655d4b8ad20699dfd0abdbf3405a49f898
    (cherry picked from commit e4a3bf0625e4fb608ffdf0fdce67d9d7cabe6822)
    Reviewed-on: https://gerrit.libreoffice.org/18034
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/vcl/unx/kde4/tst_exclude_socket_notifiers.hxx b/vcl/unx/kde4/tst_exclude_socket_notifiers.hxx
index 5e7843f..3adb956 100644
--- a/vcl/unx/kde4/tst_exclude_socket_notifiers.hxx
+++ b/vcl/unx/kde4/tst_exclude_socket_notifiers.hxx
@@ -74,7 +74,8 @@ static int tst_processEventsExcludeSocket()
     QSocketNotifier notifier( pipes[ 0 ], QSocketNotifier::Read );
     QObject::connect( &notifier, SIGNAL( activated( int )), &test, SLOT( slotReceived()));
     char dummy = 'a';
-    write( pipes[ 1 ], &dummy, 1 );
+    if( 1 != write( pipes[ 1 ], &dummy, 1 ) )
+        return 1;
     QEventLoop loop;
     loop.processEvents( QEventLoop::ExcludeSocketNotifiers );
     QVERIFY( !test.received );


More information about the Libreoffice-commits mailing list