dart:io | Change names for SecureSocket exceptions.

runtime/bin/dartutils.cc

 // Copyright (c) 2012, 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/dartutils.h"
 
 #include "include/dart_api.h"
 #include "include/dart_native_api.h"
 
 #include "platform/assert.h"
@@ skipping 235 matching lines @@
 static Dart_Handle SingleArgDart_Invoke(Dart_Handle lib, const char* method,
                                         Dart_Handle arg) {
   const int kNumArgs = 1;
   Dart_Handle dart_args[kNumArgs];
   dart_args[0] = arg;
   return Dart_Invoke(lib, DartUtils::NewString(method), kNumArgs, dart_args);
 }
 
 
 // TODO(iposva): Allocate from the zone instead of leaking error string
-// here. On the other hand the binary is about the exit anyway.
+// here. On the other hand the binary is about to exit anyway.
 #define SET_ERROR_MSG(error_msg, format, ...)                                  \
   intptr_t len = snprintf(NULL, 0, format, __VA_ARGS__);                       \
-  char *msg = reinterpret_cast<char*>(malloc(len + 1));                        \
+  char* msg = reinterpret_cast<char*>(malloc(len + 1));                        \
   snprintf(msg, len + 1, format, __VA_ARGS__);                                 \
   *error_msg = msg
 
 
 Dart_Handle MakeHttpRequest(Dart_Handle uri, Dart_Handle builtin_lib,
                             uint8_t** buffer, intptr_t* buffer_len) {
   const intptr_t HttpResponseCodeOK = 200;
   ASSERT(buffer != NULL);
   ASSERT(buffer_len != NULL);
   ASSERT(!Dart_HasLivePorts());
@@ skipping 508 matching lines @@
 Dart_Handle DartUtils::NewDartOSError(OSError* os_error) {
   // Create a dart:io OSError object with the information retrieved from the OS.
   Dart_Handle type = GetDartType(kIOLibURL, "OSError");
   Dart_Handle args[2];
   args[0] = NewString(os_error->message());
   args[1] = Dart_NewInteger(os_error->code());
   return Dart_New(type, Dart_Null(), 2, args);
 }
 
 
-Dart_Handle DartUtils::NewDartSocketException(const char* message,
-                                              Dart_Handle os_error) {
-  // Create a dart:io SocketException object.
-  Dart_Handle type = GetDartType(kIOLibURL, "SocketException");
+Dart_Handle DartUtils::NewDartExceptionWithOSError(const char* library_url,
+                                                   const char* exception_name,
+                                                   const char* message,
+                                                   Dart_Handle os_error) {
+  // Create a Dart Exception object with a message and an OSError.
+  Dart_Handle type = GetDartType(library_url, exception_name);
   Dart_Handle args[2];
   args[0] = NewString(message);
   args[1] = os_error;
   return Dart_New(type, Dart_Null(), 2, args);
 }
 
 
 Dart_Handle DartUtils::NewDartExceptionWithMessage(const char* library_url,
                                                    const char* exception_name,
                                                    const char* message) {
   // Create a Dart Exception object with a message.
   Dart_Handle type = GetDartType(library_url, exception_name);
   if (message != NULL) {
     Dart_Handle args[1];
     args[0] = NewString(message);
     return Dart_New(type, Dart_Null(), 1, args);
   } else {
     return Dart_New(type, Dart_Null(), 0, NULL);
   }
 }
 
 
 Dart_Handle DartUtils::NewDartArgumentError(const char* message) {
   return NewDartExceptionWithMessage(kCoreLibURL,
                                      "ArgumentError",
                                      message);
 }
 
 
+Dart_Handle DartUtils::NewDartIOException(const char* exception_name,
+                                          const char* message,
+                                          Dart_Handle os_error) {
+  // Create a dart:io exception object of the given type.
+  return NewDartExceptionWithOSError(kIOLibURL,
+                                     exception_name,
+                                     message,
+                                     os_error);
+}
+
+
 Dart_Handle DartUtils::NewInternalError(const char* message) {
   return NewDartExceptionWithMessage(kCoreLibURL, "InternalError", message);
 }
 
 
 void DartUtils::SetOriginalWorkingDirectory() {
   original_working_directory = Directory::Current();
 }
 
 
@@ skipping 151 matching lines @@
       new CObjectString(CObject::NewString(os_error->message()));
   CObjectArray* result = new CObjectArray(CObject::NewArray(3));
   result->SetAt(0, new CObjectInt32(CObject::NewInt32(kOSError)));
   result->SetAt(1, new CObjectInt32(CObject::NewInt32(os_error->code())));
   result->SetAt(2, error_message);
   return result;
 }
 
 }  // namespace bin
 }  // namespace dart