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

src/shared/srpc/rpc_service.c

 /*
  * Copyright (c) 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.
  */
 
 /*
  * Service descriptions.
  */
 
@@ skipping 416 matching lines @@
 static void ServiceDiscovery(NaClSrpcRpc* rpc,
                              NaClSrpcArg** in_args,
                              NaClSrpcArg** out_args,
                              NaClSrpcClosure* done) {
   UNREFERENCED_PARAMETER(in_args);
   rpc->result = NACL_SRPC_RESULT_APP_ERROR;
   if (NULL == rpc->channel || NULL == rpc->channel->server) {
     done->Run(done);
     return;
   }
-  if (out_args[0]->u.caval.count >=
-      rpc->channel->server->service_string_length) {
-    strncpy(out_args[0]->u.caval.carr,
+  if (out_args[0]->u.count >= rpc->channel->server->service_string_length) {
+    strncpy(out_args[0]->arrays.carr,
             rpc->channel->server->service_string,
             rpc->channel->server->service_string_length);
     /* Set the length of the string actually returned. */
-    out_args[0]->u.caval.count = rpc->channel->server->service_string_length;
+    out_args[0]->u.count = rpc->channel->server->service_string_length;
     rpc->result = NACL_SRPC_RESULT_OK;
   }
   done->Run(done);
 }