| Index: src/native_client/src/trusted/desc/posix/nacl_desc_conn_cap.c
|
| diff --git a/src/native_client/src/trusted/desc/posix/nacl_desc_conn_cap.c b/src/native_client/src/trusted/desc/posix/nacl_desc_conn_cap.c
|
| index d7f2a569958715014c89b0c6661685d088d385c4..b890d6a850f40d987022c5ef55908d6dcf16ef40 100644
|
| --- a/src/native_client/src/trusted/desc/posix/nacl_desc_conn_cap.c
|
| +++ b/src/native_client/src/trusted/desc/posix/nacl_desc_conn_cap.c
|
| @@ -77,12 +77,11 @@ int NaClDescConnCapFdExternalize(struct NaClDesc *vself,
|
| return 0;
|
| }
|
|
|
| -int NaClDescConnCapFdConnectAddr(struct NaClDesc *vself,
|
| - struct NaClDescEffector *effp) {
|
| +int NaClDescConnCapFdConnectAddr(struct NaClDesc *vself,
|
| + struct NaClDesc **result) {
|
| struct NaClDescConnCapFd *self = (struct NaClDescConnCapFd *) vself;
|
| NaClHandle sock_pair[2];
|
| struct NaClDescImcDesc *connected_socket;
|
| - int retval;
|
| char control_buf[CMSG_SPACE(sizeof(int))];
|
| struct iovec iovec;
|
| struct msghdr connect_msg;
|
| @@ -125,20 +124,14 @@ int NaClDescConnCapFdConnectAddr(struct NaClDesc *vself,
|
| return -NACL_ABI_ENOMEM;
|
| }
|
|
|
| - retval = (*effp->vtbl->ReturnCreatedDesc)(
|
| - effp, (struct NaClDesc *) connected_socket);
|
| - if (retval < 0) {
|
| - /* connected_socket is fully constructed, so we cannot simply free
|
| - it at this point. */
|
| - NaClDescUnref((struct NaClDesc *) connected_socket);
|
| - }
|
| - return retval;
|
| + *result = (struct NaClDesc *) connected_socket;
|
| + return 0;
|
| }
|
|
|
| -int NaClDescConnCapFdAcceptConn(struct NaClDesc *vself,
|
| - struct NaClDescEffector *effp) {
|
| +int NaClDescConnCapFdAcceptConn(struct NaClDesc *vself,
|
| + struct NaClDesc **result) {
|
| UNREFERENCED_PARAMETER(vself);
|
| - UNREFERENCED_PARAMETER(effp);
|
| + UNREFERENCED_PARAMETER(result);
|
|
|
| NaClLog(LOG_ERROR, "NaClDescConnCapFdAcceptConn: not IMC\n");
|
| return -NACL_ABI_EINVAL;
|
|
|