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

tests/srpc/srpc_nrd_server.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 <assert.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ skipping 69 matching lines @@
 
 /* GetMsg simply returns a string in a character array. */
 static void GetMsg(NaClSrpcRpc *rpc,
                    NaClSrpcArg **in_args,
                    NaClSrpcArg **out_args,
                    NaClSrpcClosure *done) {
   static char message[] = "Quidquid id est, timeo Danaos et dona ferentes";
 
   printf("ServerThread: GetMsg\n");
 
-  if (out_args[0]->u.caval.count >= strlen(message)) {
-    strncpy(out_args[0]->u.caval.carr, message, strlen(message) + 1);
+  if (out_args[0]->u.count >= strlen(message)) {
+    strncpy(out_args[0]->arrays.carr, message, strlen(message) + 1);
     rpc->result = NACL_SRPC_RESULT_OK;
   } else {
-    printf("GetMsg: u.caval.count %u is too small %u\n",
-           (unsigned) out_args[0]->u.caval.count,
+    printf("GetMsg: u.count %u is too small %u\n",
+           (unsigned) out_args[0]->u.count,
            (unsigned) strlen(message));
     ++errors_seen;
     rpc->result = NACL_SRPC_RESULT_APP_ERROR;
   }
   done->Run(done);
 }
 
 /* Shutdown stops the RPC service. */
 static void Shutdown(NaClSrpcRpc *rpc,
                      NaClSrpcArg **in_args,
@@ skipping 47 matching lines @@
 
 /*
  * TestSharedMemory tests the passing of shared memory regions.
  * It expects to receive a handle and a string.
  */
 void TestSharedMemory(NaClSrpcRpc *rpc,
                       NaClSrpcArg **in_args,
                       NaClSrpcArg **out_args,
                       NaClSrpcClosure *done) {
   int desc = in_args[0]->u.hval;
-  char* compare_string = in_args[1]->u.sval.str;
+  char* compare_string = in_args[1]->arrays.str;
   char* map_addr;
   struct stat st;
 
   printf("TestSharedMemory(%d, %s)\n", desc, compare_string);
   if (fstat(desc, &st)) {
     printf("TestSharedMemory: fstat failed\n");
     ++errors_seen;
   } else {
     size_t length = (size_t) st.st_size;
     printf("TestSharedMemory: fstat returned 0x%08x\n", length);
@@ skipping 60 matching lines @@
    * srpc_sockaddr.html tests this by doing
    * __defaultSocketAddress().connect().  So, rather than using
    * NaClSrpcAcceptClientConnection(), we handle multiple connections
    * explicitly.
    */
   while (1) {
     assert(NaClSrpcAcceptClientOnThread(srpc_methods));
   }
   NaClSrpcModuleFini();
 }