Restructure the structs/unions involved in SRPC argument passing. This will...

src/trusted/plugin/plugin.cc

 /*
  * Copyright 2008 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 "native_client/src/trusted/plugin/plugin.h"
 
 #include <assert.h>
 #include <fcntl.h>
@@ skipping 48 matching lines @@
       plugin::SharedMemory::New(plugin, params->ins()[0]->u.ival);
   plugin::ScriptableHandle* shared_memory =
       plugin->browser_interface()->NewScriptableHandle(portable_shared_memory);
   if (NULL == shared_memory) {
     params->set_exception_string("out of memory");
     portable_shared_memory->Delete();
     return false;
   }
 
   params->outs()[0]->tag = NACL_SRPC_ARG_TYPE_OBJECT;
-  params->outs()[0]->u.oval = shared_memory;
+  params->outs()[0]->arrays.oval = shared_memory;
   return true;
 }
 
 bool DefaultSocketAddress(void* obj, plugin::SrpcParams* params) {
   plugin::Plugin* plugin = reinterpret_cast<plugin::Plugin*>(obj);
   if (NULL == plugin->socket_address()) {
     params->set_exception_string("no socket address");
     return false;
   }
   // Plug the scriptable object into the return values.
   params->outs()[0]->tag = NACL_SRPC_ARG_TYPE_OBJECT;
-  params->outs()[0]->u.oval = plugin->socket_address()->AddRef();
+  params->outs()[0]->arrays.oval = plugin->socket_address()->AddRef();
   return true;
 }
 
 // A method to test the cost of invoking a method in a plugin without
 // making an RPC to the service runtime.  Used for performance evaluation.
 bool NullPluginMethod(void* obj, plugin::SrpcParams* params) {
   UNREFERENCED_PARAMETER(obj);
   params->outs()[0]->tag = NACL_SRPC_ARG_TYPE_INT;
   params->outs()[0]->u.ival = 0;
   return true;
@@ skipping 19 matching lines @@
   UNREFERENCED_PARAMETER(obj);
   UNREFERENCED_PARAMETER(params);
   params->set_exception_string("__nexes is a write-only property");
   return false;
 }
 
 // Update "nexes", a write-only property that computes a value to
 // assign to the "src" property based on the supported sandbox.
 bool SetNexesProperty(void* obj, plugin::SrpcParams* params) {
   return reinterpret_cast<plugin::Plugin*>(obj)->
-      SetNexesPropertyImpl(params->ins()[0]->u.sval.str);
+      SetNexesPropertyImpl(params->ins()[0]->arrays.str);
 }
 
 bool GetSrcProperty(void* obj, plugin::SrpcParams* params) {
   plugin::Plugin* plugin = reinterpret_cast<plugin::Plugin*>(obj);
   const char* url = plugin->nacl_module_url().c_str();
   PLUGIN_PRINTF(("GetSrcProperty ('src'='%s')\n", url));
   if (NACL_NO_URL != plugin->nacl_module_url()) {
-    params->outs()[0]->u.sval.str = strdup(url);
+    params->outs()[0]->arrays.str = strdup(url);
     return true;
   } else {
     // No url to set 'src' to.
     return false;
   }
 }
 
 bool SetSrcProperty(void* obj, plugin::SrpcParams* params) {
   PLUGIN_PRINTF(("SetSrcProperty ()\n"));
   return reinterpret_cast<plugin::Plugin*>(obj)->
-      SetSrcPropertyImpl(params->ins()[0]->u.sval.str);
+      SetSrcPropertyImpl(params->ins()[0]->arrays.str);
 }
 
 bool GetHeightProperty(void* obj, plugin::SrpcParams* params) {
   plugin::Plugin* plugin = reinterpret_cast<plugin::Plugin*>(obj);
   params->outs()[0]->u.ival = plugin->height();
   return true;
 }
 
 bool SetHeightProperty(void* obj, plugin::SrpcParams* params) {
   plugin::Plugin* plugin = reinterpret_cast<plugin::Plugin*>(obj);
@@ skipping 39 matching lines @@
 bool Plugin::SendAsyncMessage(void* obj, SrpcParams* params,
                               nacl::DescWrapper** fds, int fds_count) {
   Plugin* plugin = reinterpret_cast<Plugin*>(obj);
   if (plugin->service_runtime_ == NULL) {
     params->set_exception_string("No subprocess running");
     return false;
   }
 
   // TODO(mseaborn): Handle strings containing NULLs.  This might
   // involve using a different SRPC type.
-  char* utf8string = params->ins()[0]->u.sval.str;
+  char* utf8string = params->ins()[0]->arrays.str;
   char* data;
   size_t data_size;
   if (!ByteStringFromUTF8(utf8string, strlen(utf8string), &data, &data_size)) {
     params->set_exception_string("Invalid string");
     return false;
   }
   nacl::DescWrapper::MsgIoVec iov;
   nacl::DescWrapper::MsgHeader message;
   iov.base = data;
   iov.length = static_cast<nacl_abi_size_t>(data_size);
@@ skipping 532 matching lines @@
 
 void VideoGlobalLock() {
   g_VideoMutex.Lock();
 }
 
 void VideoGlobalUnlock() {
   g_VideoMutex.Unlock();
 }
 
 }  // namespace plugin