Attach the native entry struct to the ArchiveEntry object.

utils/archive/messaging.c

Index: utils/archive/messaging.c
diff --git a/utils/archive/messaging.c b/utils/archive/messaging.c
index 6a1c97dbd8400909c756c99858c28f42470226ef..0c1a06455bc519761a70d8c5759d60b12737532a 100644
--- a/utils/archive/messaging.c
+++ b/utils/archive/messaging.c
@@ -8,8 +8,8 @@
 #include "messaging.h"
 
 void postResult(Dart_Port p, bool success, int err, Dart_CObject* response) {
-  DART_BOOL(wrapped_success, success)
-  DART_INT32(wrapped_err, err)
+  DART_BOOL(wrapped_success, success);
+  DART_INT32(wrapped_err, err);
   
   Dart_CObject* values[3];
   values[0] = &wrapped_success;
@@ -25,7 +25,7 @@ void postResult(Dart_Port p, bool success, int err, Dart_CObject* response) {
 }
 
 void postError(Dart_Port p, struct archive* a) {
-  DART_STRING(error_string, (char*) archive_error_string(a))
+  DART_STRING(error_string, (char*) archive_error_string(a));
   postResult(p, false, archive_errno(a), &error_string);
 }
 
@@ -37,7 +37,7 @@ void postInvalidArgument(Dart_Port p, const char* format, ...) {
   vsnprintf(buffer, 256, format, args);
   va_end(args);
 
-  DART_STRING(error_string, buffer)
+  DART_STRING(error_string, buffer);
   postResult(p, false, EINVAL, &error_string);
 }
 
@@ -47,7 +47,7 @@ void postSuccess(Dart_Port p, Dart_CObject* response) {
     return;
   }
 
-  DART_NULL(null_response)
+  DART_NULL(null_response);
   postResult(p, true, 0, &null_response);
 }
 
@@ -58,6 +58,15 @@ bool checkError(Dart_Port p, struct archive* a, int result) {
   postError(p, a);
 }
 
+bool checkPointerError(Dart_Port p, void* pointer, char* name) {
+  if (pointer != NULL) return false;
+  char buffer[100];
+  snprintf(buffer, 100, "Failed to allocate memory for %s.", name);
+  DART_STRING(error_string, buffer);
+  postResult(p, false, ENOMEM, &error_string);
+  return true;
+}
+
 bool checkType(Dart_Port p, Dart_CObject* object, enum Type type) {
   if (object->type == type) return false;
   postInvalidArgument(p, "Invalid argument: expected type %d, was type %d.",
@@ -70,6 +79,12 @@ void checkResult(Dart_Port p, struct archive* a, int result) {
   postSuccess(p, NULL);
 }
 
+void checkPointerResult(Dart_Port p, void* pointer, char* name) {
+  if (checkPointerError(p, pointer, name)) return;
+  DART_INT64(result, (intptr_t) pointer);
+  postSuccess(p, &result);
+}
+
 Dart_CObject* getArgument(Dart_Port p, Dart_CObject* request, int i) {
   if (checkType(p, request, kArray)) return NULL;
 
@@ -106,3 +121,20 @@ int64_t getInteger(Dart_CObject* object) {
   if (object->type == kInt64) return object->value.as_int64;
   if (object->type == kInt32) return (int64_t) object->value.as_int32;
 }
+
+Dart_CObject* getNullableStringArgument(Dart_Port p, Dart_CObject* request,
+    int i) {
+  Dart_CObject* arg = getArgument(p, request, i);
+  if (arg == NULL) return NULL;
+  if (arg->type == kNull) return arg;
+  if (arg->type == kString) return arg;
+  postInvalidArgument(p, "Invalid argument %d: expected string or null, was " \
+    "type %d.", i+1, arg->type);
+  return NULL;
+}
+
+char* getNullableString(Dart_CObject* object) {
+  assert(object->type == kNull || object->type == kString);
+  if (object->type == kString) return object->value.as_string;
+  return NULL;
+}