IMC: Remove ReturnCreatedDesc() method from effector object

src/native_client/src/trusted/desc/posix/nacl_desc_conn_cap.c

 /*
  * Copyright 2010  The Native Client Authors.  All rights reserved.
  * Use of this source code is governed by a BSD-style license that can
  * be found in the LICENSE file.
  */
 
 /*
  * NaCl Service Runtime.  I/O Descriptor / Handle abstraction.
  * Connection capabilities.
  */
@@ skipping 59 matching lines @@
 int NaClDescConnCapFdExternalize(struct NaClDesc          *vself,
                                  struct NaClDescXferState *xfer) {
   struct NaClDescConnCapFd    *self;
 
   self = (struct NaClDescConnCapFd *) vself;
   *xfer->next_handle++ = self->connect_fd;
 
   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;
   struct cmsghdr *cmsg;
   int sent;
 
   if (NaClSocketPair(sock_pair) != 0) {
     return -NACL_ABI_EMFILE;
   }
 
@@ skipping 22 matching lines @@
   }
 
   connected_socket = malloc(sizeof(*connected_socket));
   if (connected_socket == NULL ||
       !NaClDescImcDescCtor(connected_socket, sock_pair[1])) {
     NaClClose(sock_pair[1]);
     free(connected_socket);
     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;
 }
 
 struct NaClDescVtbl const kNaClDescConnCapFdVtbl = {
   NaClDescConnCapFdDtor,
   NaClDescMapNotImplemented,
   NaClDescUnmapUnsafeNotImplemented,
   NaClDescUnmapNotImplemented,
@@ skipping 37 matching lines @@
   if (!NaClDescCtor(&conn_cap->base)) {
     free(conn_cap);
     return -NACL_ABI_ENOMEM;
   }
   conn_cap->base.vtbl = &kNaClDescConnCapFdVtbl;
   conn_cap->connect_fd = *xfer->next_handle;
   *xfer->next_handle++ = NACL_INVALID_HANDLE;
   *result = &conn_cap->base;
   return 0;
 }