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

tests/srpc/srpc_nrd_client.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.
  */
 
 
 /*
  * NativeClient client side of a test for passing socket addresses.  The
  * client side steps are:
@@ skipping 109 matching lines @@
     } else {
       strncpy(map_addr, test_string, strlen(test_string));
     }
   } else {
     printf("SharedMemoryClient: imc_mem_obj_create failed %d\n", desc);
     ++errors_seen;
   }
   /* Return the imc descriptor, the string we wrote, and the error count. */
   out_args[0]->u.hval = desc;
   /* NOTE: string return values from SRPC need to be heap allocated. */
-  out_args[1]->u.sval.str = strdup(test_string);
+  out_args[1]->arrays.str = strdup(test_string);
   out_args[2]->u.ival = errors_seen;
   rpc->result = NACL_SRPC_RESULT_OK;
   done->Run(done);
 }
 
 const struct NaClSrpcHandlerDesc srpc_methods[] = {
   { "sock_addr_client:h:i", SockAddrClient },
   { "shared_memory_client:i:hsi", SharedMemoryClient },
   { NULL, NULL },
 };
 
 int main() {
   printf("================== CLIENT ================\n");
   if (!NaClSrpcModuleInit()) {
     return 1;
   }
   printf("================== CLIENT INIT ================\n");
   if (!NaClSrpcAcceptClientConnection(srpc_methods)) {
     printf("================== CLIENT ACCEPT FAILED ================\n");
     return 1;
   }
   printf("================== CLIENT ACCEPT DONE ================\n");
   NaClSrpcModuleFini();
   return 0;
 }