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

tests/syscalls_deprecated/srpc_av.c

 /*
  * Copyright 2010 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.
  */
 
 /*
  * Test deprecated AV syscalls and verify that they fail in Chrome.
  * These tests intentionally invoke at the syscall level.
  */
@@ skipping 15 matching lines @@
 #define kSampleCount 4096
 #define kMessageSize 256
 
 uint32_t pixels[kWidth * kHeight];
 uint16_t samples[kSampleCount];
 
 NaClSrpcError ErrorMsg(NaClSrpcArg **out_args, const char *func, int retval) {
   char message[kMessageSize];
   snprintf(message, kMessageSize, "Function %s returned %d\n", func, retval);
   /* SRPC will free string, so use strndup to make a copy */
-  out_args[0]->u.sval.str = strndup(message, kMessageSize);
+  out_args[0]->arrays.str = strndup(message, kMessageSize);
   return NACL_SRPC_RESULT_OK;
 }
 
 /*
  *  Return a string.
  *   "SUCCESS" - all tests passed
  *  !"SUCCESS" - string contains name and return value of failed test.
  *
  * AVTest will test deprecated multimedia syscalls (50..58)
  * These deprecated syscalls are expected to return -ENOSYS when nexe is
@@ skipping 127 matching lines @@
     return;
   }
 
   ret = NACL_SYSCALL(audio_stream)(samples, &count);
   if (-ENOSYS != ret) {
     rpc->result = ErrorMsg(out_args, "audio_stream(samples, &count)", ret);
     done->Run(done);
     return;
   }
 
-  out_args[0]->u.sval.str = strdup("SUCCESS");
+  out_args[0]->arrays.str = strdup("SUCCESS");
   rpc->result = NACL_SRPC_RESULT_OK;
   done->Run(done);
 }
 
 const struct NaClSrpcHandlerDesc srpc_methods[] = {
   { "avtest::s", AVTest },
   { NULL, NULL },
 };
 
 int main() {
   if (!NaClSrpcModuleInit()) {
     return 1;
   }
   if (!NaClSrpcAcceptClientConnection(srpc_methods)) {
     return 1;
   }
   NaClSrpcModuleFini();
   return 0;
 }