Changeset 769 for trunk/src/network/socket/qnativesocketengine_unix.cpp

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/network/socket/qnativesocketengine_unix.cpp (modified) (6 diffs)

trunk/src/network/socket/qnativesocketengine_unix.cpp

@@ -602 +602 @@
     // well be 0, so we can't check recvfrom's return value.
     ssize_t readBytes;
+
+
+
+
     do {
         char c;
         readBytes = ::recvfrom(socketDescriptor, &c, 1, MSG_PEEK, &storage.a, &storageSize);
     } while (readBytes == -1 && errno == EINTR);
+
 
     // If there's no error, or if our buffer was too small, there must be a
@@ -662 +667 @@
 
     ssize_t recvFromResult = 0;
+
+
+
+
+
     do {
         char c;
@@ -667 +677 @@
                                     0, &aa.a, &sz);
     } while (recvFromResult == -1 && errno == EINTR);
+
 
     if (recvFromResult == -1) {
@@ -833 +844 @@
     qt_ignore_sigpipe();
 
-    // loop while ::write() returns -1 and errno == EINTR, in case
-    // of an interrupting signal.
     ssize_t writtenBytes;
-    do {
-#ifdef Q_OS_SYMBIAN
-            writtenBytes = ::write(socketDescriptor, data, len);
-#else
-        writtenBytes = qt_safe_write(socketDescriptor, data, len);
-#endif
-        // writtenBytes = QT_WRITE(socketDescriptor, data, len); ### TODO S60: Should this line be removed or the one above it?
-    } while (writtenBytes < 0 && errno == EINTR);
+#ifdef Q_OS_SYMBIAN
+    // Symbian does not support signals natively and Open C returns EINTR when moving to offline
+    writtenBytes = ::write(socketDescriptor, data, len);
+#else
+    writtenBytes = qt_safe_write(socketDescriptor, data, len);
+#endif
 
     if (writtenBytes < 0) {
@@ -883 +890 @@
 
     ssize_t r = 0;
-    do {
-#ifdef Q_OS_SYMBIAN
-        r = ::read(socketDescriptor, data, maxSize);
-#else
-        r = qt_safe_read(socketDescriptor, data, maxSize);
-#endif
-    } while (r == -1 && errno == EINTR);
+#ifdef Q_OS_SYMBIAN
+    r = ::read(socketDescriptor, data, maxSize);
+#else
+    r = qt_safe_read(socketDescriptor, data, maxSize);
+#endif
 
     if (r < 0) {
@@ -904 +909 @@
         case EINVAL:
         case EIO:
-            setError(QAbstractSocket::NetworkError, ReadErrorString);
+            
             break;
 #ifdef Q_OS_SYMBIAN