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

tests/photo/nacl_file.cc

 /*
  * 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.
  */
 
 // This is a very basic file interface for Native Client.  It allows
 // Javascript to register a file which can then be read in C code via
 // the standard file interface; for example fopen(), fread(), fclose().
 //
@@ skipping 57 matching lines @@
       NaClSrpcArg **in_args, \
       NaClSrpcArg **out_args, \
       NaClSrpcClosure *done)
 
 NACL_SRPC_HANDLER("file:shi:", NaClFile) {
   char *pathname;
   int fd;
   int last;
   struct nacl_file_map *entry;
 
-  pathname = in_args[0]->u.sval;
+  pathname = in_args[0]->arrays.str;
   fd = in_args[1]->u.ival;
   last = in_args[2]->u.hval;
 
   printf("NaClFile(%s,%d,%d)\n", pathname, fd, last);
 
   entry = reinterpret_cast<nacl_file_map*>(malloc(sizeof *entry));
 
   if (NULL == entry) {
     fprintf(stderr, "No memory for file map for %s\n", pathname);
     exit(1);
@@ skipping 153 matching lines @@
     case SEEK_END:
       offset = __real_lseek(nacl_files[dd].real_fd, offset, SEEK_END);
       break;
   }
   if (-1 != offset) {
     nacl_files[dd].pos = offset;
   }
   pthread_mutex_unlock(&nacl_files[dd].mu);
   return offset;
 }