src/native_client/src/trusted/desc/posix/nacl_desc_imc_bound_desc.c - Issue 3076010: IMC: Remove ReturnCreatedDesc() method from effector object

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/native_client/src/trusted/desc/posix/nacl_desc_imc_bound_desc.c

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

« src/native_client/src/trusted/desc/nrd_xfer_effector.c ('K') | « src/native_client/src/trusted/desc/posix/nacl_desc_conn_cap.c ('k') | src/native_client/src/trusted/handle_pass/browser_handle.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: src/native_client/src/trusted/desc/posix/nacl_desc_imc_bound_desc.c

diff --git a/src/native_client/src/trusted/desc/posix/nacl_desc_imc_bound_desc.c b/src/native_client/src/trusted/desc/posix/nacl_desc_imc_bound_desc.c

index 672777e1747807657e1fa4bb583ff40798b02aae..bfbe6c92a343e49ed915bc6a0539a08df06745fd 100644

--- a/src/native_client/src/trusted/desc/posix/nacl_desc_imc_bound_desc.c

+++ b/src/native_client/src/trusted/desc/posix/nacl_desc_imc_bound_desc.c

@@ -57,8 +57,8 @@ int NaClDescImcBoundDescClose(struct NaClDesc *vself,

return 0;

}

-int NaClDescImcBoundDescAcceptConn(struct NaClDesc *vself,

- struct NaClDescEffector *effp) {

+int NaClDescImcBoundDescAcceptConn(struct NaClDesc *vself,

+ struct NaClDesc **result) {

* See NaClDescConnCapConnectAddr code in nacl_desc_conn_cap.c

@@ -115,10 +115,8 @@ int NaClDescImcBoundDescAcceptConn(struct NaClDesc *vself,

}

received_fd = NACL_INVALID_HANDLE;

- retval = (*effp->vtbl->ReturnCreatedDesc)(effp, (struct NaClDesc *) peer);

- if (retval < 0) {

- (*peer->base.base.vtbl->Dtor)((struct NaClDesc *) peer);

- }

+ *result = (struct NaClDesc *) peer;

+ retval = 0;

cleanup:

if (retval < 0) {