Plugin: Remove __socketAddressFactory() and toString() on SocketAddresses

src/native_client/src/trusted/desc/nacl_desc_wrapper.cc

 // Copyright (c) 2009 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.
 
 #include <limits>
 #include <new>
 #include "native_client/src/include/portability.h"
 #include "native_client/src/include/portability_string.h"
 #include "native_client/src/shared/imc/nacl_imc.h"
 #include "native_client/src/shared/platform/nacl_log.h"
@@ skipping 308 matching lines @@
 #endif  // NACL_STANDALONE
 
 DescWrapper* DescWrapperFactory::MakeGeneric(struct NaClDesc* desc) {
   // Return an error if the factory wasn't properly initialized.
   if (!common_data_->is_initialized()) {
     return NULL;
   }
   return new(std::nothrow) DescWrapper(common_data_, desc);
 }
 
-DescWrapper* DescWrapperFactory::MakeSocketAddress(const char* str) {
-  struct NaClDescConnCap* conn_cap = NULL;
-  DescWrapper* wrapper = NULL;
-
-  // Ensure argument is a valid string short enough to be a socket address.
-  if (NULL == str) {
-    return NULL;
-  }
-  size_t len = strnlen(str, NACL_PATH_MAX);
-  // strnlen ensures NACL_PATH_MAX >= len.  If NACL_PATH_MAX == len, then
-  // there is not enough room to hold the address.
-  if (NACL_PATH_MAX == len) {
-    return NULL;
-  }
-  // Create a NaClSocketAddress from the string.
-  struct NaClSocketAddress sock_addr;
-  // We need len + 1 to guarantee the zero byte is written.  This is safe,
-  // since NACL_PATH_MAX >= len + 1 from above.
-  strncpy(sock_addr.path, str, len + 1);
-  // Create a NaClDescConnCap from the socket address.
-  conn_cap = reinterpret_cast<NaClDescConnCap*>(
-      calloc(1, sizeof(*conn_cap)));
-  if (NULL == conn_cap) {
-    goto cleanup;
-  }
-  if (!NaClDescConnCapCtor(conn_cap, &sock_addr)) {
-    free(conn_cap);
-    conn_cap = NULL;
-    goto cleanup;
-  }
-  wrapper = MakeGeneric(reinterpret_cast<struct NaClDesc*>(conn_cap));
-  if (NULL == wrapper) {
-    goto cleanup;
-  }
-  // If wrapper was created, it took ownership.  If not, NaClDescUnref freed it.
-  conn_cap = NULL;
-  return wrapper;
-
- cleanup:
-  NaClDescSafeUnref(reinterpret_cast<struct NaClDesc*>(conn_cap));
-  return NULL;
-}
-
 int DescWrapperFactory::MakeSocketPair(DescWrapper* pair[2]) {
   // Return an error if the factory wasn't properly initialized.
   if (!common_data_->is_initialized()) {
     return -1;
   }
   struct NaClDesc* descs[2] = { NULL, NULL };
   DescWrapper* tmp_pair[2] = { NULL, NULL };
 
   int ret = NaClCommonDescSocketPair(descs);
   if (0 != ret) {
@@ skipping 84 matching lines @@
 }
 
 DescWrapper::~DescWrapper() {
   if (NULL != common_data_) {
     common_data_->Unref();
   }
   NaClDescSafeUnref(desc_);
   desc_ = NULL;
 }
 
-const char* DescWrapper::conn_cap_path() const {
-  if (NULL == desc_ || NACL_DESC_CONN_CAP != type_tag()) {
-    return NULL;
-  }
-  struct NaClDescConnCap* conn_cap =
-      reinterpret_cast<struct NaClDescConnCap*>(desc_);
-  return conn_cap->cap.path;
-}
-
 int DescWrapper::Map(void** addr, size_t* size) {
   return NaClDescMapDescriptor(desc_, common_data_->effp(), addr, size);
 }
 
 int DescWrapper::Unmap(void* start_addr, size_t len) {
   return desc_->vtbl->Unmap(desc_, common_data_->effp(), start_addr, len);
 }
 
 ssize_t DescWrapper::Read(void* buf, size_t len) {
   return desc_->vtbl->Read(desc_, common_data_->effp(), buf, len);
@@ skipping 220 matching lines @@
 
 int DescWrapper::SemWait() {
   return desc_->vtbl->SemWait(desc_, common_data_->effp());
 }
 
 int DescWrapper::GetValue() {
   return desc_->vtbl->GetValue(desc_, common_data_->effp());
 }
 
 }  // namespace nacl