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

src/trusted/service_runtime/sel_ldr.c

 /*
  * 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 <string.h>
 
 /*
  * NaCl Simple/secure ELF loader (NaCl SEL).
@@ skipping 844 matching lines @@
   int                     rval;
   NaClErrorCode           suberr = LOAD_INTERNAL;
   size_t                  rounded_size;
 
   UNREFERENCED_PARAMETER(out_args);
 
   NaClLog(4, "NaClLoadModuleRpc: entered\n");
 
   rpc->result = NACL_SRPC_RESULT_INTERNAL;
 
-  aux = strdup(in_args[1]->u.sval.str);
+  aux = strdup(in_args[1]->arrays.str);
   if (NULL == aux) {
     rpc->result = NACL_SRPC_RESULT_NO_MEMORY;
     goto cleanup;
   }
   NaClLog(4, "Received aux_info: %s\n", aux);
 
   switch (NACL_VTBL(NaClDesc, nexe_binary)->typeTag) {
     case NACL_DESC_SHM:
       /*
        * We don't know the actual size of the nexe, but it should not
@@ skipping 180 matching lines @@
   NaClLog(4, "NaClSecureChannelStartModuleRpc finished\n");
   rpc->result = NACL_SRPC_RESULT_OK;
   done->Run(done);
 }
 
 static void NaClSecureChannelLog(struct NaClSrpcRpc      *rpc,
                                  struct NaClSrpcArg      **in_args,
                                  struct NaClSrpcArg      **out_args,
                                  struct NaClSrpcClosure  *done) {
   int severity = in_args[0]->u.ival;
-  char *msg = in_args[1]->u.sval.str;
+  char *msg = in_args[1]->arrays.str;
 
   UNREFERENCED_PARAMETER(out_args);
 
   NaClLog(5, "NaClSecureChannelLog started\n");
   NaClLog(severity, "%s\n", msg);
   NaClLog(5, "NaClSecureChannelLog finished\n");
   rpc->result = NACL_SRPC_RESULT_OK;
   done->Run(done);
 }
 
@@ skipping 84 matching lines @@
   nacl_global_xlate_base = mem_start;
 
 #ifdef __GNUC__
   _ovly_debug_event ();
 #endif
 }
 
 void NaClGdbHook(struct NaClApp const *nap) {
   StopForDebuggerInit(nap->mem_start);
 }