From b8e3de897a05ac07ea8cff5774d982ce6ad605b2 Mon Sep 17 00:00:00 2001
From: Derrick Brashear <shadow@dementia.org>
Date: Tue, 20 Oct 2009 15:03:09 -0400
Subject: [PATCH] afscp warnings cleanup

make the copy of afscp in src/tests compile with fewer warnings
(and provide needed prototype for RXAFSCB_ExecuteRequest)

Reviewed-on: http://gerrit.openafs.org/694
Tested-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
---
 src/tests/afscp.c   | 7 +++++--
 src/tests/warnerr.c | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/tests/afscp.c b/src/tests/afscp.c
index d3c0194fb..0fdc55c7a 100644
--- a/src/tests/afscp.c
+++ b/src/tests/afscp.c
@@ -13,6 +13,8 @@
 
 #include <afs/param.h>
 #include <afs/afsint.h>
+#define FSINT_COMMON_XG 1
+#include <afs/afscbint.h>
 #include <sys/ioctl.h>
 #include <afs/venus.h>
 #include <afs/cellconfig.h>
@@ -20,6 +22,7 @@
 
 /*#include <rx/rxkad.h>*/
 #include <rx/rx_null.h>
+#include <rx/rx_prototypes.h>
 
 /*#include <krb.h>*/
 #include <afs/com_err.h>
@@ -145,7 +148,7 @@ do_rx_Init(void)
     }
 
     len = sizeof(struct sockaddr_in);
-    if (getsockname(rx_socket, &s, &len)) {
+    if (getsockname(rx_socket, (struct sockaddr *)&s, (socklen_t *)&len)) {
 	perror("getsockname");
 	return 1;
     }
@@ -448,7 +451,7 @@ main(int argc, char **argv)
     if (slcl) {
 	bytesremaining = statbuf.st_size;
     } else {
-	rx_Read(scall, &bytesremaining, sizeof(afs_int32));
+	rx_Read(scall, (char *)&bytesremaining, sizeof(afs_int32));
 	bytesremaining = ntohl(bytesremaining);
     }
 
diff --git a/src/tests/warnerr.c b/src/tests/warnerr.c
index f00154863..30d13e2ab 100644
--- a/src/tests/warnerr.c
+++ b/src/tests/warnerr.c
@@ -59,7 +59,7 @@ setprogname(const char *argv0)
 	return;
     p = strrchr(argv0, '/');
     if (p == NULL)
-	p = argv0;
+      p = (char *)argv0;
     else
 	p++;
     __progname = p;
-- 
2.39.5