From 837fb322e57c80aac5e5dee43fc7220727c1049f Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Fri, 29 Jan 2010 14:13:47 +0000
Subject: [PATCH] Fix USS to use volser prototypes

Fix the uss_vol.c file to use the volser prototypes. This clears up the
list of the warnings in this file, so drop the warning supression from
the Makefile, and remove the entry from README.WARNINGS

Change-Id: I9e4ec8bdfa39e3a7adafea454a4c6d96c5fc9d0f
Reviewed-on: http://gerrit.openafs.org/1204
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---
 README.WARNINGS     | 1 -
 src/uss/Makefile.in | 2 +-
 src/uss/uss_vol.c   | 4 +++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.WARNINGS b/README.WARNINGS
index 045c43d49..6a6316880 100644
--- a/README.WARNINGS
+++ b/README.WARNINGS
@@ -64,7 +64,6 @@ ubik/beacon.c        : all           : Ubik uses signed/unsigned
 				       interchangably for IP addresses, a 
 				       fix will require API changes.
 ubik/ubikclient.c    : strict-protos : ubik_Call
-uss/uss_vol.c 	     : all             Format issues
 uss/uss_kauth.c      : all	     : ubik_Call
 viced/fsprobe.c      : all	     : ubik_Call
 vol/salvager.c       : all           : consts & undefined variable from header - maybe fixed!
diff --git a/src/uss/Makefile.in b/src/uss/Makefile.in
index f5d25638c..08268126b 100644
--- a/src/uss/Makefile.in
+++ b/src/uss/Makefile.in
@@ -59,7 +59,7 @@ uss_common.o : uss_common.c
 	${CC} -c ${CFLAGS} ${srcdir}/uss_common.c
 
 uss_vol.o : uss_vol.c
-	${CC} -c ${CFLAGS} @CFLAGS_NOERROR@ ${srcdir}/uss_vol.c
+	${CC} -c ${CFLAGS} ${srcdir}/uss_vol.c
 
 uss_acl.o : uss_acl.c
 	${CC} -c ${CFLAGS} ${srcdir}/uss_acl.c
diff --git a/src/uss/uss_vol.c b/src/uss/uss_vol.c
index ccc21c2de..019543c7e 100644
--- a/src/uss/uss_vol.c
+++ b/src/uss/uss_vol.c
@@ -38,6 +38,7 @@
 #include <afs/cellconfig.h>
 #include <rx/rx_globals.h>
 #include <afs/volser.h>
+#include <afs/volser_prototypes.h>
 #include <afs/volint.h>
 #include <afs/keys.h>
 #include <afs/afsutil.h>
@@ -615,7 +616,8 @@ uss_vol_CreateVol(char *a_volname, char *a_server, char *a_partition,
     static char rn[] = "uss_vol_CreateVol";	/*Routine name */
 #endif
     afs_int32 pname;		/*Partition name */
-    afs_int32 volid, code;	/*Volume ID, return code */
+    afs_uint32 volid;		/*Volume ID */
+    afs_int32 code;		/*return code */
     afs_int32 saddr;		/*Socket info for server */
     int VolExistFlag = 0;	/*Does the volume exist? */
     int mpExistFlag = 0;	/*Does the mountpoint exist? */
-- 
2.39.5