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

tests/srpc/srpc_test.c

 /*
  * 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.
  */
 
 /*
  * Interface test for simple rpc (SRPC).  Tests passing of all supported
  * parameter and return types.
  *
@@ skipping 88 matching lines @@
   done->Run(done);
 }
 
 /*
  *  The test for string returns the length of the string.
  */
 void StringMethod(NaClSrpcRpc *rpc,
                   NaClSrpcArg **in_args,
                   NaClSrpcArg **out_args,
                   NaClSrpcClosure *done) {
-  out_args[0]->u.ival = strlen(in_args[0]->u.sval.str);
+  out_args[0]->u.ival = strlen(in_args[0]->arrays.str);
   rpc->result = NACL_SRPC_RESULT_OK;
   done->Run(done);
 }
 
 /*
  *  Second, tests for array argument passing and return.
  *  All the array methods reverse their input arrays and return them.
  *  If the counts don't match, return an error.
  */
 
 void CharArrayMethod(NaClSrpcRpc *rpc,
                      NaClSrpcArg **in_args,
                      NaClSrpcArg **out_args,
                      NaClSrpcClosure *done) {
   int i, length;
-  if (out_args[0]->u.caval.count != in_args[0]->u.caval.count) {
+  if (out_args[0]->u.count != in_args[0]->u.count) {
     printf("CharArrayMethod: count mismatch: in=%d out=%d\n",
-           (int) in_args[0]->u.caval.count, (int) out_args[0]->u.caval.count);
+           (int) in_args[0]->u.count, (int) out_args[0]->u.count);
     rpc->result = NACL_SRPC_RESULT_APP_ERROR;
     done->Run(done);
   }
-  length = in_args[0]->u.caval.count;
+  length = in_args[0]->u.count;
   for (i = 0; i < length; i++) {
-    out_args[0]->u.caval.carr[length - i - 1] = in_args[0]->u.caval.carr[i];
+    out_args[0]->arrays.carr[length - i - 1] = in_args[0]->arrays.carr[i];
   }
   rpc->result = NACL_SRPC_RESULT_OK;
   done->Run(done);
 }
 
 void DoubleArrayMethod(NaClSrpcRpc *rpc,
                        NaClSrpcArg **in_args,
                        NaClSrpcArg **out_args,
                        NaClSrpcClosure *done) {
   int i, length;
-  if (out_args[0]->u.daval.count != in_args[0]->u.daval.count) {
+  if (out_args[0]->u.count != in_args[0]->u.count) {
     rpc->result = NACL_SRPC_RESULT_APP_ERROR;
     done->Run(done);
   }
-  length = in_args[0]->u.daval.count;
+  length = in_args[0]->u.count;
   for (i = 0; i < length; i++) {
-    out_args[0]->u.daval.darr[length - i - 1] = in_args[0]->u.daval.darr[i];
+    out_args[0]->arrays.darr[length - i - 1] = in_args[0]->arrays.darr[i];
   }
   rpc->result = NACL_SRPC_RESULT_OK;
   done->Run(done);
 }
 
 void IntArrayMethod(NaClSrpcRpc *rpc,
                     NaClSrpcArg **in_args,
                     NaClSrpcArg **out_args,
                     NaClSrpcClosure *done) {
   int i, length;
-  if (out_args[0]->u.iaval.count != in_args[0]->u.iaval.count) {
+  if (out_args[0]->u.count != in_args[0]->u.count) {
     rpc->result = NACL_SRPC_RESULT_APP_ERROR;
     done->Run(done);
   }
-  length = in_args[0]->u.iaval.count;
+  length = in_args[0]->u.count;
   for (i = 0; i < length; i++) {
-    out_args[0]->u.iaval.iarr[length - i - 1] = in_args[0]->u.iaval.iarr[i];
+    out_args[0]->arrays.iarr[length - i - 1] = in_args[0]->arrays.iarr[i];
   }
   rpc->result = NACL_SRPC_RESULT_OK;
   done->Run(done);
 }
 
 void LongArrayMethod(NaClSrpcRpc *rpc,
                      NaClSrpcArg **in_args,
                      NaClSrpcArg **out_args,
                      NaClSrpcClosure *done) {
   int i, length;
-  if (out_args[0]->u.laval.count != in_args[0]->u.laval.count) {
+  if (out_args[0]->u.count != in_args[0]->u.count) {
     rpc->result = NACL_SRPC_RESULT_APP_ERROR;
     done->Run(done);
   }
-  length = in_args[0]->u.laval.count;
+  length = in_args[0]->u.count;
   for (i = 0; i < length; i++) {
-    out_args[0]->u.laval.larr[length - i - 1] = in_args[0]->u.laval.larr[i];
+    out_args[0]->arrays.larr[length - i - 1] = in_args[0]->arrays.larr[i];
   }
   rpc->result = NACL_SRPC_RESULT_OK;
   done->Run(done);
 }
 
 /*
  * A null RPC to test throughput and latency.
  */
 void NullMethod(NaClSrpcRpc *rpc,
                 NaClSrpcArg **in_args,
@@ skipping 19 matching lines @@
                          "Der Gipfel des Berges funkelt,"
                          "Im Abendsonnenschein."
                          "Die schoenste Jungfrau sitzet"
                          "Dort oben wunderbar,"
                          "Ihr gold'nes Geschmeide blitzet,"
                          "Sie kaemmt ihr goldenes Haar,"
                          "Sie kaemmt es mit goldenem Kamme,"
                          "Und singt ein Lied dabei;"
                          "Das hat eine wundersame,"
                          "Gewalt'ge Melodei.";
-  out_args[0]->u.sval.str = strdup(string + in_args[0]->u.ival);
+  out_args[0]->arrays.str = strdup(string + in_args[0]->u.ival);
   rpc->result = NACL_SRPC_RESULT_OK;
   done->Run(done);
 }
 
 /*
  * A method to receive a handle (descriptor).
  */
 void HandleMethod(NaClSrpcRpc *rpc,
                   NaClSrpcArg **in_args,
                   NaClSrpcArg **out_args,
@@ skipping 65 matching lines @@
 int main() {
   if (!NaClSrpcModuleInit()) {
     return 1;
   }
   if (!NaClSrpcAcceptClientConnection(srpc_methods)) {
     return 1;
   }
   NaClSrpcModuleFini();
   return 0;
 }