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

src/trusted/plugin/srt_socket.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 <string.h>
 
 #include "native_client/src/trusted/plugin/srt_socket.h"
@@ skipping 51 matching lines @@
   }
   SrpcParams params;
   bool success = connected_socket()->InitParams(kLoadModule,
                                                 METHOD_CALL,
                                                 &params);
   if (!success) {
     return false;
   }
 
   params.ins()[0]->u.hval = desc;
-  params.ins()[1]->u.sval.str = strdup("place holder");
-  if (NULL == params.ins()[1]->u.sval.str) {
+  params.ins()[1]->arrays.str = strdup("place holder");
+  if (NULL == params.ins()[1]->arrays.str) {
     return false;
   }
 
   bool rpc_result = connected_socket()->Invoke(kLoadModule,
                                                METHOD_CALL,
                                                &params);
   return rpc_result;
 }
 #if NACL_WINDOWS && !defined(NACL_STANDALONE)
 bool SrtSocket::InitHandlePassing(NaClDesc* desc,
@@ skipping 73 matching lines @@
   }
   SrpcParams params;
   bool success;
   success = connected_socket()->InitParams(kLogIdent,
                                            METHOD_CALL,
                                            &params);
   if (!success) {
     return false;
   }
   params.ins()[0]->u.ival = severity;
-  params.ins()[1]->u.sval.str = strdup(msg.c_str());
-  if (NULL == params.ins()[1]->u.sval.str) {
+  params.ins()[1]->arrays.str = strdup(msg.c_str());
+  if (NULL == params.ins()[1]->arrays.str) {
     return false;
   }
   bool rpc_result = (connected_socket()->Invoke(kLogIdent,
                                                 METHOD_CALL,
                                                 &params));
   return rpc_result;
 }
 
 }  // namespace plugin