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

tools/srpcgen.py

 #!/usr/bin/python
 # Copyright 2010, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
@@ skipping 68 matching lines @@
 #ifndef UNREFERENCED_PARAMETER
 #define UNREFERENCED_PARAMETER(P) do { (void) P; } while (0)
 #endif  // UNREFERENCED_PARAMETER
 #else
 #include "native_client/src/include/portability.h"
 #include "native_client/src/shared/srpc/nacl_srpc.h"
 #endif  // __native_client__
 """
 
 types = {'bool': ['b', 'bool', 'u.bval', ''],
-         'char[]': ['C', 'char*', 'u.caval.carr', 'u.caval.count'],
+         'char[]': ['C', 'char*', 'arrays.carr', 'u.count'],
          'double': ['d', 'double', 'u.dval', ''],
-         'double[]': ['D', 'double*', 'u.daval.darr', 'u.daval.count'],
+         'double[]': ['D', 'double*', 'arrays.darr', 'u.count'],
          'handle': ['h', 'NaClSrpcImcDescType', 'u.hval', ''],
          'int32_t': ['i', 'int32_t', 'u.ival', ''],
-         'int32_t[]': ['I', 'int32_t*', 'u.iaval.iarr', 'u.iaval.count'],
+         'int32_t[]': ['I', 'int32_t*', 'arrays.iarr', 'u.count'],
          'int64_t': ['l', 'int64_t', 'u.lval', ''],
-         'int64_t[]': ['L', 'int64_t', 'u.laval.larr', 'u.laval.count'],
-         'string': ['s', 'char*', 'u.sval.str', ''],
+         'int64_t[]': ['L', 'int64_t', 'arrays.larr', 'u.count'],
+         'string': ['s', 'char*', 'arrays.str', ''],
         }
 
 
 def CountName(name):
   """Returns the name of the auxiliary count member used for array typed."""
   return '%s_bytes' % name
 
 
 def FormatRpcPrototype(is_server, class_name, indent, rpc):
   """Returns a string for the prototype of an individual RPC."""
@@ skipping 261 matching lines @@
     PrintClientFile(cc_file, h_file_name, specs)
   elif mode == 'server':
     PrintHeaderFile(h_file, True, include_guard_name, interface_name, specs)
     PrintServerFile(cc_file, h_file_name, interface_name, specs)
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))