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>

diff --git a/README.WARNINGS b/README.WARNINGS
index 045c43d49b9c97582b6f6d4c4a2ca56e4ffac1b3..6a63168800a225d6e113a13623949826962790b6 100644 (file)
--- 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 f5d25638c2b8986ca8bd43756006d2b4eed93b06..08268126bb130c7e37b6a7df7b2b548c59073658 100644 (file)
--- 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 ccc21c2de8bac216c400c4997b256d7ca179ed5b..019543c7e6e39da159f5e227af30a44bc5b29183 100644 (file)
--- 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? */