Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(193)

Unified Diff: src/native_client/src/trusted/desc/nacl_desc_wrapper.cc

Issue 3076010: IMC: Remove ReturnCreatedDesc() method from effector object (Closed)
Patch Set: Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/native_client/src/trusted/desc/nacl_desc_wrapper.cc
diff --git a/src/native_client/src/trusted/desc/nacl_desc_wrapper.cc b/src/native_client/src/trusted/desc/nacl_desc_wrapper.cc
index 61b3252387eff4e39d9e47ed405873593e5ff94b..7a8a47dfbaa2515c5cbaf5af67715952b97c08e3 100644
--- a/src/native_client/src/trusted/desc/nacl_desc_wrapper.cc
+++ b/src/native_client/src/trusted/desc/nacl_desc_wrapper.cc
@@ -597,18 +597,12 @@ ssize_t DescWrapper::RecvMsg(MsgHeader* dgram, int flags) {
}
DescWrapper* DescWrapper::Connect() {
- int rv = desc_->vtbl->ConnectAddr(desc_, common_data_->effp());
+ struct NaClDesc* connected_desc;
+ int rv = desc_->vtbl->ConnectAddr(desc_, &connected_desc);
if (0 != rv) {
// Connect failed.
return NULL;
}
- struct NaClNrdXferEffector* nrd_effector =
- reinterpret_cast<struct NaClNrdXferEffector*>(common_data_->effp());
- struct NaClDesc* connected_desc = NaClNrdXferEffectorTakeDesc(nrd_effector);
- if (NULL == connected_desc) {
- // Take from effector failed.
- return NULL;
- }
DescWrapper* wrapper =
new(std::nothrow) DescWrapper(common_data_, connected_desc);
if (NULL == wrapper) {
@@ -618,19 +612,12 @@ DescWrapper* DescWrapper::Connect() {
}
DescWrapper* DescWrapper::Accept() {
- int rv = desc_->vtbl->AcceptConn(desc_, common_data_->effp());
+ struct NaClDesc* connected_desc;
+ int rv = desc_->vtbl->AcceptConn(desc_, &connected_desc);
if (0 != rv) {
// Accept failed.
return NULL;
}
-
- struct NaClNrdXferEffector* nrd_effector =
- reinterpret_cast<struct NaClNrdXferEffector*>(common_data_->effp());
- struct NaClDesc* connected_desc = NaClNrdXferEffectorTakeDesc(nrd_effector);
- if (NULL == connected_desc) {
- // Take from effector failed.
- return NULL;
- }
DescWrapper* wrapper =
new(std::nothrow) DescWrapper(common_data_, connected_desc);
if (NULL == wrapper) {

Powered by Google App Engine
This is Rietveld 408576698