Changeset 1244 for pjproject/trunk/pjlib/src/pj/ioqueue_symbian.cpp

Timestamp:

May 2, 2007 6:54:19 PM (18 years ago)

Author:

bennylp

Message:

Errno and memory size tweaking for Symbian

File:

• pjproject/trunk/pjlib/src/pj/ioqueue_symbian.cpp (modified) (3 diffs)

pjproject/trunk/pjlib/src/pj/ioqueue_symbian.cpp

@@ -217 +217 @@
     }
 
-    if (iStatus==KRequestPending) {
-        SetActive();
-        return PJ_EPENDING;
-    } else {
-        // Complete immediately (with success or error)
-        if (iStatus == KErrNone) {
-            *size = aBufferPtr_.Length();
-            HandleReadCompletion();
-            return PJ_SUCCESS;
-        }
-        else {
-            pending_data_.read_.op_key_ = NULL;
-            pending_data_.read_.addr_ = NULL;
-            pending_data_.read_.addrlen_ = NULL;
-            return PJ_RETURN_OS_ERROR(iStatus.Int());
-        }
-    }
+    SetActive();
+    return PJ_EPENDING;
 }
 
@@ -261 +246 @@
     sock_->Socket().Accept(blank_sock_, iStatus);
 
-    if (iStatus==KRequestPending) {
-        SetActive();
-        return PJ_EPENDING;
-    } else {
-        // Accept() completed immediately (with success or error).
-        if (iStatus == KErrNone) {
-            HandleAcceptCompletion();
-            return PJ_SUCCESS;
-        }
-        else {
-            pending_data_.accept_.op_key_ = NULL;
-            pending_data_.accept_.new_sock_ = NULL;
-            pending_data_.accept_.local_ = NULL;
-            pending_data_.accept_.remote_ = NULL;
-            pending_data_.accept_.addrlen_ = NULL;
-            return PJ_RETURN_OS_ERROR(iStatus.Int());
-        }
-    }
+    SetActive();
+    return PJ_EPENDING;
 }
 
@@ -287 +256 @@
 void CIoqueueCallback::HandleReadCompletion() 
 {
-        if (pending_data_.read_.addr_) {
-            PjSymbianOS::Addr2pj(aAddress_, 
-                                 *(pj_sockaddr_in*)pending_data_.read_.addr_);
-            pending_data_.read_.addr_ = NULL;
-        }
-        if (pending_data_.read_.addrlen_) {
-            *pending_data_.read_.addrlen_ = sizeof(pj_sockaddr_in);
-            pending_data_.read_.addrlen_ = NULL;
-        }
+    if (pending_data_.read_.addr_) {
+        PjSymbianOS::Addr2pj(aAddress_, 
+                             *(pj_sockaddr_in*)pending_data_.read_.addr_);
+        pending_data_.read_.addr_ = NULL;
+    }
+    if (pending_data_.read_.addrlen_) {
+        *pending_data_.read_.addrlen_ = sizeof(pj_sockaddr_in);
+        pending_data_.read_.addrlen_ = NULL;
+    }
         
-        pending_data_.read_.op_key_ = NULL;
+    pending_data_.read_.op_key_ = NULL;
 }