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

src/shared/srpc/nacl_srpc.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.
  */
 
 /*
  * NaCl service library.  a primitive rpc library
  */
 
@@ skipping 17 matching lines @@
   NaClSrpcArg          out_carray;
   NaClSrpcArg*         outs[2];
   NaClSrpcService*     tmp_service = NULL;
   NaClSrpcService*     service = NULL;
   NaClSrpcHandlerDesc  basic_services[] = { { NULL, NULL } };
 
   /* Set up the output parameters for service discovery. */
   outs[0] = &out_carray;
   outs[1] = NULL;
   out_carray.tag = NACL_SRPC_ARG_TYPE_CHAR_ARRAY;
-  out_carray.u.caval.carr = NULL;
+  out_carray.arrays.carr = NULL;
   /* Set up the basic service descriptor to make the service discovery call. */
   tmp_service = (NaClSrpcService*) malloc(sizeof(*tmp_service));
   if (NULL == tmp_service) {
     goto cleanup;
   }
   if (!NaClSrpcServiceHandlerCtor(tmp_service, basic_services)) {
     goto cleanup;
   }
   channel->client = tmp_service;
   /* Build the argument values for invoking service discovery */
   outs[0] = &out_carray;
   outs[1] = NULL;
   out_carray.tag = NACL_SRPC_ARG_TYPE_CHAR_ARRAY;
-  out_carray.u.caval.count = NACL_SRPC_MAX_SERVICE_DISCOVERY_CHARS;
-  out_carray.u.caval.carr = calloc(NACL_SRPC_MAX_SERVICE_DISCOVERY_CHARS, 1);
-  if (NULL == out_carray.u.caval.carr) {
+  out_carray.u.count = NACL_SRPC_MAX_SERVICE_DISCOVERY_CHARS;
+  out_carray.arrays.carr = calloc(NACL_SRPC_MAX_SERVICE_DISCOVERY_CHARS, 1);
+  if (NULL == out_carray.arrays.carr) {
     goto cleanup;
   }
   /* Invoke service discovery, getting description string */
   if (NACL_SRPC_RESULT_OK != NaClSrpcInvokeV(channel, 0, ins, outs)) {
     goto cleanup;
   }
   /* Clean up the temporary service. */
   NaClSrpcServiceDtor(tmp_service);
   free(tmp_service);
   tmp_service = NULL;
   /* Allocate the real service. */
   service = (NaClSrpcService*) malloc(sizeof(*service));
   if (NULL == service) {
     goto cleanup;
   }
   /* Build the real service from the resulting string. */
-  if (!NaClSrpcServiceStringCtor(service, out_carray.u.caval.carr)) {
+  if (!NaClSrpcServiceStringCtor(service, out_carray.arrays.carr)) {
     goto cleanup;
   }
   channel->client = service;
   /* Free the service string */
-  free(out_carray.u.caval.carr);
+  free(out_carray.arrays.carr);
   /* Return success */
   return 1;
 
  cleanup:
   free(service);
-  free(out_carray.u.caval.carr);
+  free(out_carray.arrays.carr);
   NaClSrpcServiceDtor(tmp_service);
   free(tmp_service);
   return 0;
 }
 
 /*
  * The constructors and destructor.
  */
 
 /*
@@ skipping 73 matching lines @@
 /*
  * A standalone SRPC server is not a subprocess of the browser or
  * sel_universal.  As this is a mode used for testing, the parent environment
  * must set the following variable to indicate that fact.
  */
 const char kSrpcStandalone[] = "NACL_SRPC_STANDALONE";
 
 int NaClSrpcIsStandalone() {
   return (NULL != getenv(kSrpcStandalone));
 }