- Modify dart_api.h to be a proper C API.

runtime/bin/file.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/file.h"
 
 #include "bin/builtin.h"
 #include "bin/dartutils.h"
 #include "bin/io_buffer.h"
 #include "bin/thread.h"
@@ skipping 553 matching lines @@
 
 
 void FUNCTION_NAME(File_Stat)(Dart_NativeArguments args) {
   Dart_EnterScope();
   if (Dart_IsString(Dart_GetNativeArgument(args, 0))) {
     const char* path =
         DartUtils::GetStringValue(Dart_GetNativeArgument(args, 0));
 
     int64_t stat_data[File::kStatSize];
     File::Stat(path, stat_data);
-    Dart_Handle returned_data = Dart_NewTypedData(kInt64, File::kStatSize);
+    Dart_Handle returned_data = Dart_NewTypedData(Dart_TypedData_kInt64,
+                                                  File::kStatSize);
     if (Dart_IsError(returned_data)) Dart_PropagateError(returned_data);
     Dart_TypedData_Type data_type_unused;
     void* data_location;
     intptr_t data_length_unused;
     Dart_Handle status = Dart_TypedDataAcquireData(returned_data,
                                                    &data_type_unused,
                                                    &data_location,
                                                    &data_length_unused);
     if (Dart_IsError(status)) Dart_PropagateError(status);
     memmove(data_location, stat_data, File::kStatSize * sizeof(int64_t));
@@ skipping 370 matching lines @@
         return CObject::NewOSError();
       }
     } else {
       return CObject::FileClosedError();
     }
   }
   return CObject::IllegalArgumentError();
 }
 
 
-static int SizeInBytes(Dart_CObject::TypedDataType type) {
+static int SizeInBytes(Dart_TypedData_Type type) {
   switch (type) {
-    case Dart_CObject::kInt8Array:
-    case Dart_CObject::kUint8Array:
-    case Dart_CObject::kUint8ClampedArray:
+    case Dart_TypedData_kInt8:
+    case Dart_TypedData_kUint8:
+    case Dart_TypedData_kUint8Clamped:
       return 1;
-    case Dart_CObject::kInt16Array:
-    case Dart_CObject::kUint16Array:
+    case Dart_TypedData_kInt16:
+    case Dart_TypedData_kUint16:
       return 2;
-    case Dart_CObject::kInt32Array:
-    case Dart_CObject::kUint32Array:
-    case Dart_CObject::kFloat32Array:
+    case Dart_TypedData_kInt32:
+    case Dart_TypedData_kUint32:
+    case Dart_TypedData_kFloat32:
       return 4;
-    case Dart_CObject::kInt64Array:
-    case Dart_CObject::kUint64Array:
-    case Dart_CObject::kFloat64Array:
+    case Dart_TypedData_kInt64:
+    case Dart_TypedData_kUint64:
+    case Dart_TypedData_kFloat64:
       return 8;
     default:
       break;
   }
   UNREACHABLE();
   return -1;
 }
 
 
 static CObject* FileWriteFromRequest(const CObjectArray& request) {
@@ skipping 144 matching lines @@
   }
   return CObject::IllegalArgumentError();
 }
 
 
 static void FileService(Dart_Port dest_port_id,
                  Dart_Port reply_port_id,
                  Dart_CObject* message) {
   CObject* response = CObject::IllegalArgumentError();
   CObjectArray request(message);
-  if (message->type == Dart_CObject::kArray) {
+  if (message->type == Dart_CObject_kArray) {
     if (request.Length() > 1 && request[0]->IsInt32()) {
       CObjectInt32 requestType(request[0]);
       switch (requestType.Value()) {
         case File::kExistsRequest:
           response = FileExistsRequest(request);
           break;
         case File::kCreateRequest:
           response = FileCreateRequest(request);
           break;
         case File::kOpenRequest:
@@ skipping 84 matching lines @@
   if (service_port != ILLEGAL_PORT) {
     // Return a send port for the service port.
     Dart_Handle send_port = Dart_NewSendPort(service_port);
     Dart_SetReturnValue(args, send_port);
   }
   Dart_ExitScope();
 }
 
 }  // namespace bin
 }  // namespace dart