[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdepimlibs/qgpgme
From:       Marc Mutz <mutz () kde ! org>
Date:       2009-10-30 16:13:47
Message-ID: 1256919227.824028.20196.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1042766 by mutz:

QIODeviceDataProvider: fix overzealous use of comma operator

 M  +6 -5      dataprovider.cpp  


--- branches/kdepim/enterprise4/kdepimlibs/qgpgme/dataprovider.cpp #1042765:1042766
@@ -164,11 +164,12 @@
     while ( !io->bytesAvailable() )
         if ( !io->waitForReadyRead( -1 ) )
             if ( const QProcess * const p = qobject_cast<QProcess*>( io.get() ) )
-                return p->error() == QProcess::UnknownError
-                    && p->exitStatus() == QProcess::NormalExit
-                    && p->exitCode() == 0
-                    ? 0
-                    : errno = EIO, -1 ;
+                if ( p->error() == QProcess::UnknownError &&
+                     p->exitStatus() == QProcess::NormalExit &&
+                     p->exitCode() == 0 )
+                    return 0;
+                else
+                    return errno = EIO, -1;
             else
                 return 0; // assume EOF (loses error cases :/ )
 
[prev in list] [next in list] [prev in thread] [next in thread]