From c418aa8df0005c5d3a2dca379c10c30937f24392 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Thu, 23 Jul 2020 10:23:42 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=B4=D0=BC=D0=BE=D0=B4=D1=83?= =?UTF-8?q?=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/cmlib | 2 +- src/myx/qt/posix_signal_watcher.cpp | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cmake/cmlib b/cmake/cmlib index 186d67c..5c90828 160000 --- a/cmake/cmlib +++ b/cmake/cmlib @@ -1 +1 @@ -Subproject commit 186d67c4bbc2fa91ecfd837d753631610aff0b1d +Subproject commit 5c90828e4e189e78fce1d93bf1700519e7aff76c diff --git a/src/myx/qt/posix_signal_watcher.cpp b/src/myx/qt/posix_signal_watcher.cpp index 8709e41..e918b8a 100644 --- a/src/myx/qt/posix_signal_watcher.cpp +++ b/src/myx/qt/posix_signal_watcher.cpp @@ -16,16 +16,16 @@ std::array< int, 2 > PosixSignalWatcherPrivate::mSockpair { { 0, 0 } }; PosixSignalWatcherPrivate::~PosixSignalWatcherPrivate() = default; PosixSignalWatcherPrivate::PosixSignalWatcherPrivate( PosixSignalWatcher* q ) : - q_ptr( q ) + q_ptr( q ) { - #if MYX_QT_HAS_POSIX_SIGNALS + #if MYX_QT_HAS_POSIX_SIGNALS // Create socket pair if ( ::socketpair( AF_UNIX, SOCK_STREAM, 0, mSockpair.data() ) != 0 ) { qDebug() << "PosixSignalWatcher: socketpair: " << ::strerror( errno ); return; } - #endif + #endif // Create a notifier for the read end of the pair // m_notifier.reset( new QSocketNotifier( mSockpair[1], QSocketNotifier::Read ) ); @@ -37,7 +37,7 @@ PosixSignalWatcherPrivate::PosixSignalWatcherPrivate( PosixSignalWatcher* q ) : Q_Q( PosixSignalWatcher ); int signal = 0; - (void)::read( sockfd, &signal, sizeof( signal ) ); + (void)!::read( sockfd, &signal, sizeof( signal ) ); qDebug() << "Caught signal: " << ::strsignal( signal ); Q_EMIT q->posixSignal( signal ); } ); @@ -61,7 +61,7 @@ MYXLIB_INLINE void PosixSignalWatcherPrivate::watchForSignal( int signal ) return; } - #if MYX_QT_HAS_POSIX_SIGNALS + #if MYX_QT_HAS_POSIX_SIGNALS // Register a sigaction which will write to the socket pair struct sigaction sigact; sigact.sa_handler = PosixSignalWatcherPrivate::signalHandler; //NOLINT @@ -73,7 +73,7 @@ MYXLIB_INLINE void PosixSignalWatcherPrivate::watchForSignal( int signal ) qDebug() << "PosixSignalWatcher: sigaction: " << ::strerror( errno ); return; } - #endif + #endif m_watchedSignals.append( signal ); } // PosixSignalWatcherPrivate::watchForSignal @@ -85,7 +85,7 @@ MYXLIB_INLINE void PosixSignalWatcherPrivate::watchForSignal( int signal ) */ MYXLIB_INLINE void PosixSignalWatcherPrivate::signalHandler( int signal ) { - (void)::write( mSockpair[0], &signal, sizeof( signal ) ); + (void)!::write( mSockpair[0], &signal, sizeof( signal ) ); } @@ -93,8 +93,8 @@ MYXLIB_INLINE void PosixSignalWatcherPrivate::signalHandler( int signal ) * Create a new PosixSignalWatcher as a child of the given \a parent. */ MYXLIB_INLINE PosixSignalWatcher::PosixSignalWatcher( QObject* parent ) : - QObject( parent ), - d_ptr ( new PosixSignalWatcherPrivate( this ) ) + QObject( parent ), + d_ptr ( new PosixSignalWatcherPrivate( this ) ) { }