Cleanup the getting and setting of the socket file descriptor

runtime/bin/socket.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "bin/io_buffer.h"
 #include "bin/socket.h"
 #include "bin/dartutils.h"
 #include "bin/thread.h"
 #include "bin/utils.h"
 
@@ skipping 96 matching lines @@
   Dart_Handle host_obj = Dart_GetNativeArgument(args, 1);
   RawAddr addr;
   Dart_Handle result = GetSockAddr(host_obj, &addr);
   int64_t port = 0;
   if (!Dart_IsError(result) &&
       DartUtils::GetInt64Value(Dart_GetNativeArgument(args, 2), &port)) {
     intptr_t socket = Socket::CreateConnect(addr, port);
     OSError error;
     Dart_TypedDataReleaseData(host_obj);
     if (socket >= 0) {
-      Dart_Handle err = Socket::SetSocketIdNativeField(socket_obj, socket);
-      if (Dart_IsError(err)) Dart_PropagateError(err);
+      Socket::SetSocketIdNativeField(socket_obj, socket);
       Dart_SetReturnValue(args, Dart_True());
     } else {
       Dart_SetReturnValue(args, DartUtils::NewDartOSError(&error));
     }
   } else {
     OSError os_error(-1, "Invalid argument", OSError::kUnknown);
     Dart_Handle err = DartUtils::NewDartOSError(&os_error);
     if (Dart_IsError(err)) Dart_PropagateError(err);
     Dart_SetReturnValue(args, err);
   }
 }
 
 
 void FUNCTION_NAME(Socket_Available)(Dart_NativeArguments args) {
-  Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
-  intptr_t socket = 0;
-  Dart_Handle err = Socket::GetSocketIdNativeField(socket_obj, &socket);
-  if (Dart_IsError(err)) Dart_PropagateError(err);
+  intptr_t socket =
+      Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
   intptr_t available = Socket::Available(socket);
   if (available >= 0) {
     Dart_SetReturnValue(args, Dart_NewInteger(available));
   } else {
     Dart_SetReturnValue(args, DartUtils::NewDartOSError());
   }
 }
 
 
 void FUNCTION_NAME(Socket_Read)(Dart_NativeArguments args) {
   static bool short_socket_reads = Dart_IsVMFlagSet("short_socket_read");
-  Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
-  intptr_t socket = 0;
-  Dart_Handle err = Socket::GetSocketIdNativeField(socket_obj, &socket);
-  if (Dart_IsError(err)) Dart_PropagateError(err);
+  intptr_t socket =
+      Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
   intptr_t available = Socket::Available(socket);
   if (available > 0) {
     int64_t length = 0;
     Dart_Handle length_obj = Dart_GetNativeArgument(args, 1);
     if (DartUtils::GetInt64Value(length_obj, &length)) {
       if (length == -1 || available < length) {
         length = available;
       }
       if (short_socket_reads) {
         length = (length + 1) / 2;
@@ skipping 31 matching lines @@
   } else if (available == 0) {
     Dart_SetReturnValue(args, Dart_Null());
   } else {
     Dart_SetReturnValue(args, DartUtils::NewDartOSError());
   }
 }
 
 
 void FUNCTION_NAME(Socket_WriteList)(Dart_NativeArguments args) {
   static bool short_socket_writes = Dart_IsVMFlagSet("short_socket_write");
-  Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
-  intptr_t socket = 0;
-  Dart_Handle err = Socket::GetSocketIdNativeField(socket_obj, &socket);
-  if (Dart_IsError(err)) Dart_PropagateError(err);
+  intptr_t socket =
+      Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
   Dart_Handle buffer_obj = Dart_GetNativeArgument(args, 1);
   ASSERT(Dart_IsList(buffer_obj));
   intptr_t offset =
       DartUtils::GetIntptrValue(Dart_GetNativeArgument(args, 2));
   intptr_t length =
       DartUtils::GetIntptrValue(Dart_GetNativeArgument(args, 3));
   if (short_socket_writes) {
     length = (length + 1) / 2;
   }
   Dart_TypedData_Type type;
@@ skipping 11 matching lines @@
   } else {
     // Extract OSError before we release data, as it may override the error.
     OSError os_error;
     Dart_TypedDataReleaseData(buffer_obj);
     Dart_SetReturnValue(args, DartUtils::NewDartOSError(&os_error));
   }
 }
 
 
 void FUNCTION_NAME(Socket_GetPort)(Dart_NativeArguments args) {
-  Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
-  intptr_t socket = 0;
-  Dart_Handle err = Socket::GetSocketIdNativeField(socket_obj, &socket);
-  if (Dart_IsError(err)) Dart_PropagateError(err);
+  intptr_t socket =
+      Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
   OSError os_error;
   intptr_t port = Socket::GetPort(socket);
   if (port > 0) {
     Dart_SetReturnValue(args, Dart_NewInteger(port));
   } else {
     Dart_SetReturnValue(args, DartUtils::NewDartOSError());
   }
 }
 
 
 void FUNCTION_NAME(Socket_GetRemotePeer)(Dart_NativeArguments args) {
-  Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
-  intptr_t socket = 0;
-  Dart_Handle err = Socket::GetSocketIdNativeField(socket_obj, &socket);
-  if (Dart_IsError(err)) Dart_PropagateError(err);
+  intptr_t socket =
+      Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
   OSError os_error;
   intptr_t port = 0;
   SocketAddress* addr = Socket::GetRemotePeer(socket, &port);
   if (addr != NULL) {
     Dart_Handle list = Dart_NewList(2);
 
     Dart_Handle entry = Dart_NewList(3);
     Dart_ListSetAt(entry, 0, Dart_NewInteger(addr->GetType()));
     Dart_ListSetAt(entry, 1, Dart_NewStringFromCString(addr->as_string()));
 
     RawAddr raw = addr->addr();
     intptr_t data_length = SocketAddress::GetAddrLength(&raw);
     Dart_Handle data = Dart_NewTypedData(Dart_TypedData_kUint8, data_length);
     Dart_ListSetAsBytes(data, 0, reinterpret_cast<uint8_t*>(&raw), data_length);
     Dart_ListSetAt(entry, 2, data);
 
     Dart_ListSetAt(list, 0, entry);
     Dart_ListSetAt(list, 1, Dart_NewInteger(port));
     Dart_SetReturnValue(args, list);
     delete addr;
   } else {
     Dart_SetReturnValue(args, DartUtils::NewDartOSError());
   }
 }
 
 
 void FUNCTION_NAME(Socket_GetError)(Dart_NativeArguments args) {
-  Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
-  intptr_t socket = 0;
-  Dart_Handle err = Socket::GetSocketIdNativeField(socket_obj, &socket);
-  if (Dart_IsError(err)) Dart_PropagateError(err);
+  intptr_t socket =
+      Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
   OSError os_error;
   Socket::GetError(socket, &os_error);
   Dart_SetReturnValue(args, DartUtils::NewDartOSError(&os_error));
 }
 
 
 void FUNCTION_NAME(Socket_GetType)(Dart_NativeArguments args) {
-  Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
-  intptr_t socket = 0;
-  Socket::GetSocketIdNativeField(socket_obj, &socket);
+  intptr_t socket =
+      Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
   OSError os_error;
   intptr_t type = Socket::GetType(socket);
   if (type >= 0) {
     Dart_SetReturnValue(args, Dart_NewInteger(type));
   } else {
     Dart_SetReturnValue(args, DartUtils::NewDartOSError());
   }
 }
 
 
 void FUNCTION_NAME(Socket_GetStdioHandle)(Dart_NativeArguments args) {
   Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
   intptr_t num =
       DartUtils::GetIntptrValue(Dart_GetNativeArgument(args, 1));
   ASSERT(num == 0 || num == 1 || num == 2);
   intptr_t socket = Socket::GetStdioHandle(num);
-  Dart_Handle err = Socket::SetSocketIdNativeField(socket_obj, socket);
-  if (Dart_IsError(err)) Dart_PropagateError(err);
+  Socket::SetSocketIdNativeField(socket_obj, socket);
   Dart_SetReturnValue(args, Dart_NewBoolean(socket >= 0));
 }
 
 
 void FUNCTION_NAME(Socket_SetSocketId)(Dart_NativeArguments args) {
   Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
   intptr_t id =
       DartUtils::GetIntptrValue(Dart_GetNativeArgument(args, 1));
-  Dart_Handle err = Socket::SetSocketIdNativeField(socket_obj, id);
-  if (Dart_IsError(err)) Dart_PropagateError(err);
+  Socket::SetSocketIdNativeField(socket_obj, id);
 }
 
 
 void FUNCTION_NAME(ServerSocket_CreateBindListen)(Dart_NativeArguments args) {
   Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
   Dart_Handle host_obj = Dart_GetNativeArgument(args, 1);
   RawAddr addr;
   Dart_Handle result = GetSockAddr(host_obj, &addr);
   Dart_Handle port_obj = Dart_GetNativeArgument(args, 2);
   Dart_Handle backlog_obj = Dart_GetNativeArgument(args, 3);
   Dart_Handle v6_only_obj = Dart_GetNativeArgument(args, 4);
   bool v6_only = DartUtils::GetBooleanValue(v6_only_obj);
   int64_t port = 0;
   int64_t backlog = 0;
   if (!Dart_IsError(result) &&
       DartUtils::GetInt64Value(port_obj, &port) &&
       DartUtils::GetInt64Value(backlog_obj, &backlog)) {
     intptr_t socket = ServerSocket::CreateBindListen(
         addr, port, backlog, v6_only);
     OSError error;
     Dart_TypedDataReleaseData(host_obj);
     if (socket >= 0) {
-      Dart_Handle err = Socket::SetSocketIdNativeField(socket_obj, socket);
-      if (Dart_IsError(err)) Dart_PropagateError(err);
+      Socket::SetSocketIdNativeField(socket_obj, socket);
       Dart_SetReturnValue(args, Dart_True());
     } else {
       if (socket == -5) {
         OSError os_error(-1, "Invalid host", OSError::kUnknown);
         Dart_SetReturnValue(args, DartUtils::NewDartOSError(&os_error));
       } else {
         Dart_SetReturnValue(args, DartUtils::NewDartOSError(&error));
       }
     }
   } else {
     OSError os_error(-1, "Invalid argument", OSError::kUnknown);
     Dart_Handle err = DartUtils::NewDartOSError(&os_error);
     if (Dart_IsError(err)) Dart_PropagateError(err);
     Dart_SetReturnValue(args, err);
   }
 }
 
 
 void FUNCTION_NAME(ServerSocket_Accept)(Dart_NativeArguments args) {
-  Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
-  intptr_t socket = 0;
-  Dart_Handle err = Socket::GetSocketIdNativeField(socket_obj, &socket);
-  if (Dart_IsError(err)) Dart_PropagateError(err);
+  intptr_t socket =
+      Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
   Dart_Handle result_socket_obj = Dart_GetNativeArgument(args, 1);
   intptr_t new_socket = ServerSocket::Accept(socket);
   if (new_socket >= 0) {
-    Dart_Handle err = Socket::SetSocketIdNativeField(result_socket_obj,
-                                                     new_socket);
-    if (Dart_IsError(err)) Dart_PropagateError(err);
+    Socket::SetSocketIdNativeField(result_socket_obj, new_socket);
     Dart_SetReturnValue(args, Dart_True());
   } else if (new_socket == ServerSocket::kTemporaryFailure) {
     Dart_SetReturnValue(args, Dart_False());
   } else {
     Dart_SetReturnValue(args, DartUtils::NewDartOSError());
   }
 }
 
 
 CObject* Socket::LookupRequest(const CObjectArray& request) {
@@ skipping 113 matching lines @@
       result = CObject::NewOSError(os_error);
       delete os_error;
     }
     return result;
   }
   return CObject::IllegalArgumentError();
 }
 
 
 void FUNCTION_NAME(Socket_SetOption)(Dart_NativeArguments args) {
-  Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
-  intptr_t socket = 0;
   bool result = false;
-  Dart_Handle err = Socket::GetSocketIdNativeField(socket_obj, &socket);
-  if (Dart_IsError(err)) Dart_PropagateError(err);
+  intptr_t socket =
+      Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
   Dart_Handle option_obj = Dart_GetNativeArgument(args, 1);
   int64_t option;
-  err = Dart_IntegerToInt64(option_obj, &option);
+  Dart_Handle err = Dart_IntegerToInt64(option_obj, &option);
   if (Dart_IsError(err)) Dart_PropagateError(err);
   Dart_Handle enabled_obj = Dart_GetNativeArgument(args, 2);
   bool enabled;
   err = Dart_BooleanValue(enabled_obj, &enabled);
   if (Dart_IsError(err)) Dart_PropagateError(err);
   switch (option) {
     case 0:  // TCP_NODELAY.
       result = Socket::SetNoDelay(socket, enabled);
       break;
     default:
       break;
   }
   Dart_SetReturnValue(args, Dart_NewBoolean(result));
 }
 
 
-Dart_Handle Socket::SetSocketIdNativeField(Dart_Handle socket, intptr_t id) {
-  return Dart_SetNativeInstanceField(socket, kSocketIdNativeField, id);
+void Socket::SetSocketIdNativeField(Dart_Handle socket, intptr_t id) {
+  Dart_Handle err =
+      Dart_SetNativeInstanceField(socket, kSocketIdNativeField, id);
+  if (Dart_IsError(err)) Dart_PropagateError(err);
 }
 
 
-Dart_Handle Socket::GetSocketIdNativeField(Dart_Handle socket, intptr_t* id) {
-  return Dart_GetNativeInstanceField(socket, kSocketIdNativeField, id);
+intptr_t Socket::GetSocketIdNativeField(Dart_Handle socket_obj) {
+  intptr_t socket = 0;
+  Dart_Handle err =
+      Dart_GetNativeInstanceField(socket_obj, kSocketIdNativeField, &socket);
+  if (Dart_IsError(err)) Dart_PropagateError(err);
+  return socket;
 }
 
 }  // namespace bin
 }  // namespace dart