From: Simon Wilkinson <sxw@inf.ed.ac.uk>
Date: Fri, 10 Jul 2009 23:54:04 +0000 (+0100)
Subject: ANSIfy bu_utils
X-Git-Tag: openafs-devel-1_5_61~138
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=5d4dabc50a0f313b95eb3ab6be7153d5f41fef5f

ANSIfy bu_utils

A very small amount of code cleanup to add prototypes, ANSIfy,
and remove warnings from the fms.c file

Reviewed-on: http://gerrit.openafs.org/53
Verified-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Verified-by: Russ Allbery <rra@stanford.edu>
Reviewed-by: Russ Allbery <rra@stanford.edu>
---

diff --git a/src/bu_utils/fms.c b/src/bu_utils/fms.c
index 5700dde..8939e06 100644
--- a/src/bu_utils/fms.c
+++ b/src/bu_utils/fms.c
@@ -14,6 +14,8 @@
 #undef	IN
 #include <stdio.h>
 #include <errno.h>
+#include <string.h>
+#include <stdlib.h>
 #include <sys/types.h>		/* for mtio.h */
 #include <afs/cmd.h>
 #include <afs/procmgmt.h>
@@ -34,6 +36,8 @@ afs_int32 eotEnabled = 1;
 int fileMark(usd_handle_t hTape);
 int fileMarkSize(char *tapeDevice);
 static int tt_fileMarkSize(struct cmd_syndesc *as, void *arock);
+afs_int32 rewindTape(usd_handle_t hTape);
+int dataBlock(usd_handle_t, afs_int32);
 
 #define ERROR(evalue)                                           \
         {                                                       \
@@ -49,15 +53,14 @@ static int tt_fileMarkSize(struct cmd_syndesc *as, void *arock);
 
 void quitFms(int);
 
-main(argc, argv)
-     int argc;
-     char **argv;
+int
+main(int argc, char **argv)
 {
     struct sigaction intaction, oldaction;
     struct cmd_syndesc *cptr;
 
     memset((char *)&intaction, 0, sizeof(intaction));
-    intaction.sa_handler = (int (*)())quitFms;
+    intaction.sa_handler = quitFms;
 
     sigaction(SIGINT, &intaction, &oldaction);
 
@@ -83,8 +86,8 @@ tt_fileMarkSize(struct cmd_syndesc *as, void *arock)
 }
 
 
-fileMarkSize(tapeDevice)
-     char *tapeDevice;
+int
+fileMarkSize(char *tapeDevice)
 {
     afs_uint32 nFileMarks, nBlocks, nbfTape;
     double tpSize, fmSize;
@@ -95,8 +98,6 @@ fileMarkSize(tapeDevice)
     afs_uint32 countr;
     afs_int32 code = 0;
 
-    afs_int32 rewindTape();
-
     code =
 	usd_Open(tapeDevice, (USD_OPEN_RDWR | USD_OPEN_WLOCK), 0777, &hTape);
     if (code) {
@@ -249,14 +250,15 @@ fileMark(usd_handle_t hTape)
  * entry:
  * 	blocksize - size of block in bytes
  */
-
+int
 dataBlock(usd_handle_t hTape, afs_int32 reqSize)
 {
     static char *dB_buffer = 0;
     static afs_int32 dB_buffersize = 0;
     static int dB_count = 0;
     int *ptr;
-    afs_int32 code = 0, xferd;
+    afs_int32 code = 0;
+    afs_uint32 xferd;
 
     /* dbBuffersize is only valid when dB_buffer is non-zero */