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

src/trusted/plugin/shared_memory.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 <errno.h>
 #include <signal.h>
 #include <string.h>
@@ skipping 84 matching lines @@
       out[0] = 0xc0 | (c >> 6);
       out[1] = 0x80 | (c & 0x3f);
       out += 2;
     }
     ++shm_addr;
   }
   // Terminate the result string with 0.
   *out = 0;
 
   params->outs()[0]->tag = NACL_SRPC_ARG_TYPE_STRING;
-  params->outs()[0]->u.sval.str = ret_string;
+  params->outs()[0]->arrays.str = ret_string;
 
   return true;
 }
 
 bool RpcWrite(void* obj, plugin::SrpcParams* params) {
   plugin::SharedMemory* shared_memory =
       reinterpret_cast<plugin::SharedMemory*>(obj);
   uint32_t offset;
   uint32_t len;
 
@@ skipping 24 matching lines @@
   if (offset + len > shared_memory->shm_size()) {
     params->set_exception_string(
         "Offset + length overlaps end of shared memory");
     return false;
   }
 
   // The input is a JavaScript string, which must consist of UFT-8
   // characters with character codes between 0 and 255 inclusive.
   NaClSrpcArg* str_param = params->ins()[2];
   const unsigned char* str =
-    reinterpret_cast<unsigned const char*>(str_param->u.sval.str);
+    reinterpret_cast<unsigned const char*>(str_param->arrays.str);
   uint32_t utf_bytes =
-      nacl::saturate_cast<uint32_t>(strlen(str_param->u.sval.str));
+      nacl::saturate_cast<uint32_t>(strlen(str_param->arrays.str));
   unsigned char* shm_addr =
     reinterpret_cast<unsigned char*>(shared_memory->shm_addr()) + offset;
 
   // TODO(mseaborn): Change this function to use ByteStringFromUTF8().
   for (unsigned int i = 0; i < len;) {
     unsigned char c1 = str[0];
     unsigned char c2 = 0;
 
     // Check that we are still pointing into the JavaScript string we were
     // passed.
@@ skipping 128 matching lines @@
   //     plugin_->effp_,
   //     addr_,
   //     size_);
   // }
   // TODO(sehr): is there a missing delete desc() here?
   // TODO(gregoryd): in addition, should we unref the descriptor if it was
   // constructed during the initialization of this object?
 }
 
 }  // namespace plugin