From: Simon Wilkinson <sxw@your-file-system.com>
Date: Thu, 23 Sep 2010 09:40:02 +0000 (+0100)
Subject: rxperf: Fix the Unix build again
X-Git-Tag: openafs-devel-1_5_78~119
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=8b9e96e0d1a4037464f6452f1213c66dfb390101;p=packages%2Fo%2Fopenafs.git

rxperf: Fix the Unix build again

Fix the Unix build of rxperf again

Reviewed-on: http://gerrit.openafs.org/2840
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit c87377834701195fe98d75ad34324bc1748e13a0)
Change-Id: I50f7a69e1f88ca814d7d9b508464cb49da6231f7
Reviewed-on: http://gerrit.openafs.org/2919
---

diff --git a/src/rx/test/rxperf.c b/src/rx/test/rxperf.c
index 91ad6889d..2985f732f 100644
--- a/src/rx/test/rxperf.c
+++ b/src/rx/test/rxperf.c
@@ -603,7 +603,7 @@ struct client_data {
     afs_int32 recvtimes;
 };
 
-static void
+static void *
 client_thread( void *vparams)
 {
     struct client_data *params = (struct client_data *)vparams;
@@ -613,7 +613,7 @@ client_thread( void *vparams)
     afs_uint32 *readwrite;
     int readp = FALSE;
     afs_uint32 size;
-    afs_int32 num;
+    afs_uint32 num;
 
     for (i = 0; i < params->times; i++) {
 
@@ -747,6 +747,8 @@ client_thread( void *vparams)
 #ifdef AFS_PTHREAD_ENV
     pthread_exit(NULL);
 #endif
+
+    return NULL;
 }
 
 /*
@@ -764,11 +766,11 @@ do_client(const char *server, short port, char *filename, afs_int32 command,
     struct rx_securityClass *secureobj;
     int secureindex;
     int ret;
-    int i;
     char stamp[2048];
     struct client_data params;
 
 #ifdef AFS_PTHREAD_ENV
+    int i;
     pthread_t thread[MAX_THREADS];
     pthread_attr_t tattr;
     void *status;