From: Simon Wilkinson <sxw@inf.ed.ac.uk>
Date: Mon, 16 Mar 2009 17:22:06 +0000 (+0000)
Subject: DEVEL15-bucoord-prototypes-20090316
X-Git-Tag: openafs-devel-1_5_58~75
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=547ae6877e98a317b3c70e2e1a33eeda6cf36e90;p=packages%2Fo%2Fopenafs.git

DEVEL15-bucoord-prototypes-20090316

LICENSE IPL10
FIXES 124238

prototype the bucoord directory


(cherry picked from commit 0097888d53b71ef38491d71c3259ca9b5ac5dfa3)
---

diff --git a/src/bucoord/bc.p.h b/src/bucoord/bc.p.h
index 4fbc1bfc6..06c9814d9 100644
--- a/src/bucoord/bc.p.h
+++ b/src/bucoord/bc.p.h
@@ -110,7 +110,7 @@ struct bc_dumpSchedule {
  * Private: represents a queued dump/restore item.
  */
 struct bc_dumpTask {
-    int (*callProc) ();
+    int (*callProc) (afs_int32);
     struct bc_config *config;
     struct bc_volumeDump *volumes;
     char *dumpName;		/*Dump name we're doing */
diff --git a/src/bucoord/bc_status.c b/src/bucoord/bc_status.c
index 63fa19c76..f1bf6a65e 100644
--- a/src/bucoord/bc_status.c
+++ b/src/bucoord/bc_status.c
@@ -25,8 +25,10 @@ RCSID
 #include <afs/bubasics.h>
 #include <lock.h>
 #include <afs/tcdata.h>
+#include <afs/cmd.h>
 #include "bc.h"
 #include "error_macros.h"
+#include "bucoord_prototypes.h"
 
 #define	SET_FLAG(set)				\
     lock_Status();				\
@@ -54,8 +56,7 @@ afs_int32 lastTaskCode;		/* Error code from task that last finished */
  *	get next item for status interrogation, if any.
  */
 static statusP
-nextItem(linkPtr)
-     statusP linkPtr;
+nextItem(statusP linkPtr)
 {
     dlqlinkP ptr;
 
@@ -108,7 +109,7 @@ void *
 cmdDispatch(void *unused)
 {
 #define	MAXV	100
-    char **targv[MAXV];		/*Ptr to parsed argv stuff */
+    char *targv[MAXV];		/*Ptr to parsed argv stuff */
     afs_int32 targc;		/*Num parsed arguments */
     afs_int32 code;
     char *internalCmdLine;
@@ -135,7 +136,7 @@ cmdDispatch(void *unused)
 void *
 statusWatcher(void *unused)
 {
-    struct rx_connection *tconn = (struct rc_connection *)0;
+    struct rx_connection *tconn = NULL;
     statusP curPollPtr = 0;
 
     struct tciStatusS statusPtr;
@@ -157,7 +158,7 @@ statusWatcher(void *unused)
     while (1) {			/*w */
 	if (tconn)
 	    rx_DestroyConnection(tconn);
-	tconn = (struct rc_connection *)0;
+	tconn = NULL;
 
 	lock_Status();
 	curPollPtr = nextItem(curPollPtr);
@@ -405,7 +406,7 @@ statusWatcher(void *unused)
  */
 
 afs_int32
-bc_jobNumber()
+bc_jobNumber(void)
 {
     afs_int32 retval = 0;
     dlqlinkP ptr;
@@ -427,11 +428,11 @@ bc_jobNumber()
  *    Return the task's flags when it's done. If the job
  *    had been cleaned up, then just return 0.
  */
-waitForTask(taskId)
-     afs_uint32 taskId;
+int
+waitForTask(afs_uint32 taskId)
 {
     statusP ptr;
-    afs_int32 done = 0, rcode, t;
+    afs_int32 done = 0, rcode = 0, t;
 
     t = (TASK_DONE | ABORT_DONE | TASK_ERROR);
     while (!done) {
diff --git a/src/bucoord/bucoord_prototypes.h b/src/bucoord/bucoord_prototypes.h
index 1807505b7..7e0039d6a 100644
--- a/src/bucoord/bucoord_prototypes.h
+++ b/src/bucoord/bucoord_prototypes.h
@@ -12,6 +12,200 @@
 /* bc_status.c */
 
 extern void *statusWatcher(void *);
+extern afs_int32 bc_jobNumber(void);
+extern int waitForTask(afs_uint32 taskId);
 
+/* command.c */
+extern char *bc_CopyString(char *astring);
+extern afs_int32 getPortOffset(char *port);
+extern afs_int32 bc_SafeATOI(char *anum);
+extern int bc_WaitForNoJobs(void);
+
+struct cmd_syndesc;
+extern int bc_DumpCmd(struct cmd_syndesc *as, void *arock);
+extern int bc_VolRestoreCmd(struct cmd_syndesc *as, void *arock);
+extern int bc_DiskRestoreCmd(struct cmd_syndesc *as, void *arock);
+extern int bc_QuitCmd(struct cmd_syndesc *as, void *arock);
+extern int bc_VolsetRestoreCmd(struct cmd_syndesc *as, void *arock);
+extern int bc_AddHostCmd(struct cmd_syndesc *as, void *arock);
+extern int bc_DeleteHostCmd(struct cmd_syndesc *as, void *arock);
+extern int bc_ListHostsCmd(struct cmd_syndesc *as, void *arock);
+extern int bc_JobsCmd(struct cmd_syndesc *as, void *arock);
+extern int bc_KillCmd(struct cmd_syndesc *as, void *arock);
+extern int bc_ListVolSetCmd(struct cmd_syndesc *as, void *arock);
+extern int bc_ListDumpScheduleCmd(struct cmd_syndesc *as, void *arock);
+extern int bc_AddVolSetCmd(struct cmd_syndesc *as, void *arock);
+extern int bc_GetTapeStatusCmd(struct cmd_syndesc *as, void *arock);
+extern int bc_DeleteVolSetCmd(struct cmd_syndesc *as, void *arock);
+extern int bc_AddVolEntryCmd(struct cmd_syndesc *as, void *arock);
+extern int bc_DeleteVolEntryCmd(struct cmd_syndesc *as, void *arock);
+extern int bc_AddDumpCmd(struct cmd_syndesc *as, void *arock);
+extern int bc_DeleteDumpCmd(struct cmd_syndesc *as, void *arock);
+extern int bc_LabelTapeCmd(struct cmd_syndesc *as, void *arock);
+extern int bc_ReadLabelCmd(struct cmd_syndesc *as, void *arock);
+extern int bc_ScanDumpsCmd(struct cmd_syndesc *as, void *arock);
+extern int bc_dblookupCmd(struct cmd_syndesc *as, void *arock);
+extern int bc_SetExpCmd(struct cmd_syndesc *as, void *arock);
+extern int bc_saveDbCmd(struct cmd_syndesc *as, void *arock);
+extern int bc_restoreDbCmd(struct cmd_syndesc *as, void *arock);
+extern int bc_dumpInfoCmd(struct cmd_syndesc *as, void *arock);
+extern int bc_dbVerifyCmd(struct cmd_syndesc *as, void *arock);
+extern int bc_deleteDumpCmd(struct cmd_syndesc *as, void *arock);
+
+
+
+
+
+
+
+
+
+/* config.c */
+extern int bc_AddTapeHost(struct bc_config *aconfig, char *aname, 
+			  afs_int32 aport);
+extern int bc_DeleteTapeHost(struct bc_config *aconfig, char *aname, 
+			     afs_int32 aport);
+
+/* dlq.c */
+extern int dlqEmpty(dlqlinkP headptr );
+extern int dlqInit(dlqlinkP headptr );
+extern void dlqUnlink(dlqlinkP );
+extern int dlqLinkb(dlqlinkP headptr, dlqlinkP entryptr);
+
+/* dsstub.c */
+extern char *tailCompPtr(char *pathNamePtr);
+
+/* dsvs.c */
+extern struct bc_volumeSet *bc_FindVolumeSet(struct bc_config *aconfig, 
+					     char *aname);
+extern void FreeVolumeSet(struct bc_volumeSet *);
+extern int bc_AddVolumeItem(struct bc_config *aconfig, char *avolName, 
+			    char *ahost, char *apart, char *avol);
+extern int bc_CreateVolumeSet(struct bc_config *aconfig, char *avolName,
+		              afs_int32 aflags);
+extern int bc_DeleteVolumeItem(struct bc_config *aconfig, char *avolName,
+		               afs_int32 anumber);
+extern int bc_DeleteVolumeSet(struct bc_config *aconfig, char *avolName,
+		              afs_int32 *flags);
+extern int bc_ParseHost(char *aname, struct sockaddr_in *asockaddr);
+extern afs_int32 bc_GetPartitionID(char *aname, afs_int32 *aval);
+extern int bc_CreateDumpSchedule(struct bc_config *aconfig, char *adumpName,
+		                 afs_int32 expDate, afs_int32 expType);
+extern int bc_DeleteDumpSchedule(struct bc_config *aconfig, char *adumpName);
+extern int FindDump(struct bc_config *aconfig, char *nodeString,
+		    struct bc_dumpSchedule **parentptr,
+		    struct bc_dumpSchedule **nodeptr);
+extern int bc_ProcessDumpSchedule(struct bc_config *aconfig);
+extern struct bc_dumpSchedule * bc_FindDumpSchedule(struct bc_config *aconfig, 
+						    char *aname);
+	
+
+/* dump.c */
+extern int CheckTCVersion(struct rx_connection *tconn);
+extern int ConnectButc(struct bc_config *config, afs_int32 port,
+		       struct rx_connection **tconn);
+extern int bc_StartDmpRst(struct bc_config *aconfig, char *adname, 
+		          char *avname, struct bc_volumeDump *avolsToDump,
+			  struct sockaddr_in *adestServer,
+			  afs_int32 adestPartition, afs_int32 afromDate, 
+			  char *anewExt, int aoldFlag, afs_int32 aparent, 
+			  afs_int32 alevel, int (*aproc) (int), 
+			  afs_int32 *ports, afs_int32 portCount,
+			  struct bc_dumpSchedule *dsptr, int append, 
+			  int dontExecute);
+extern int bc_Dumper(int);
+extern int bc_LabelTape(char *afsname, char *pname, afs_int32 size,
+		        struct bc_config *config, afs_int32 port);
+extern int bc_ReadLabel(struct bc_config *config, afs_int32 port);
+extern int bc_ScanDumps(struct bc_config *config, afs_int32 dbAddFlag, 
+		        afs_int32 port);
+	
+	
+
+
+/* dump_sched.c */
+extern afs_int32 bc_UpdateDumpSchedule(void);
+extern int bc_SaveDumpSchedule(void);
+
+/* expire.c */
+struct cmd_parmdesc;
+extern afs_int32 bc_ParseExpiration(struct cmd_parmdesc *paramPtr, 
+		                    afs_int32 *expType, afs_int32 *expDate);
+/* main.c */
+extern afs_int32 doDispatch(afs_int32, char *[], afs_int32);
+extern void bc_HandleMisc(afs_int32 code);
+
+/* regex.c */
+extern char *re_comp(const char *sp);
+extern int re_exec(const char *p1);
+
+/* restore.c */
+extern int BackupName(char *);
+extern int bc_Restorer(afs_int32);
+
+/* status.c */
+extern void initStatus(void);
+extern void lock_Status(void);
+extern void unlock_Status(void);
+extern void lock_cmdLine(void);
+extern void unlock_cmdLine(void);
+extern void clearStatus(afs_uint32, afs_uint32);
+extern statusP createStatusNode(void);
+extern void deleteStatusNode(statusP ptr);
+extern statusP findStatus(afs_uint32);
+
+/* tape_hosts.c */
+extern afs_int32 bc_UpdateHosts(void);
+extern int bc_SaveHosts(void);
+
+/* ubik_db_if.c */
+extern int bc_LockText(udbClientTextP ctPtr);
+extern int bc_UnlockText(udbClientTextP ctPtr);
+extern int bcdb_SaveTextFile(udbClientTextP ctPtr);
+extern afs_int32 filesize(FILE *stream);
+extern int bc_CheckTextVersion(udbClientTextP ctPtr);
+extern int bc_openTextFile(udbClientTextP ctPtr, char *tmpFileName);
+extern int bcdb_GetTextFile(register udbClientTextP ctPtr);
+extern int bcdb_FindDumpByID(afs_int32 dumpID, struct budb_dumpEntry *deptr);
+extern afs_int32 bcdb_FindVolumes(afs_int32 dumpID, char *volumeName, 
+		                  struct budb_volumeEntry *returnArray, 
+				  afs_int32 last, afs_int32 *next, 
+				  afs_int32 maxa, afs_int32 *nEntries);
+extern int bcdb_FindDump(char *volumeName, afs_int32 beforeDate, 
+		         struct budb_dumpEntry *deptr);
+extern afs_int32 bcdb_FindLastVolClone(char *volSetName, char *dumpName, 
+				       char *volName, afs_int32 *clonetime);
+extern int bcdb_FindLatestDump(char *volSetName, char *dumpPath, 
+		               struct budb_dumpEntry *deptr);
+extern afs_int32 bcdb_FindClone(afs_int32 dumpID, char *volName, 
+				afs_int32 *clonetime);
+extern afs_int32 bcdb_AddVolume(register struct budb_volumeEntry *);
+extern afs_int32 bcdb_AddVolumes(register struct budb_volumeEntry *, 
+				 afs_int32 );
+extern afs_int32 bcdb_CreateDump(register struct budb_dumpEntry *) ;
+extern afs_int32 bcdb_deleteDump(afs_int32 dumpID, afs_int32 fromTime, 
+				 afs_int32 toTime, budb_dumpsList *dumps);
+extern afs_int32 bcdb_listDumps (afs_int32 sflags, afs_int32 groupId, 
+		                 afs_int32 fromTime, afs_int32 toTime, 
+				 budb_dumpsList *dumps, budb_dumpsList *flags);
+extern afs_int32 bcdb_DeleteVDP(char *, char *, afs_int32 );
+extern afs_int32 bcdb_FindClone(afs_int32, char *, afs_int32 *);
+extern afs_int32 bcdb_LookupVolume(char *volumeName, 
+				   struct budb_volumeEntry *returnArray, 
+		                   afs_int32 last, afs_int32 *next, 
+				   afs_int32 maxa, afs_int32 *nEntries);
+extern int bcdb_FindTape(afs_int32 dumpid, char *tapeName, 
+		         struct budb_tapeEntry *teptr);
+extern int bcdb_FindTapeSeq(afs_int32 dumpid, afs_int32 tapeSeq, 
+		            struct budb_tapeEntry *teptr);
+
+/* vol_sets.c */
+extern afs_int32 bc_UpdateVolumeSet(void);
+extern int bc_SaveVolumeSet(void);
+
+/* volstub.c */
+
+extern afs_int32 volImageTime(afs_int32 serv, afs_int32 part, afs_int32 volid, 
+		              afs_int32 voltype, afs_int32 *clDatePtr);
 #endif
 
diff --git a/src/bucoord/commands.c b/src/bucoord/commands.c
index a7e598c48..ffb468f78 100644
--- a/src/bucoord/commands.c
+++ b/src/bucoord/commands.c
@@ -38,42 +38,45 @@ RCSID
 #include <afs/voldefs.h>	/* PA */
 #include <afs/vldbint.h>	/* PA */
 #include <afs/ktime.h>		/* PA */
+#include <ubik.h>
 #include <time.h>
-
 #include <lock.h>
 #include <afs/butc.h>
 #include <afs/tcdata.h>
 #include <afs/butx.h>
+#include <afs/vsutils_prototypes.h>
 #include "bc.h"
 #include "error_macros.h"
-
+#include "bucoord_prototypes.h"
+#include "regex.h"
 
 extern struct bc_config *bc_globalConfig;
-extern struct bc_dumpSchedule *bc_FindDumpSchedule();
-extern struct bc_volumeSet *bc_FindVolumeSet(struct bc_config *cfg,
-					     char *name);
 extern struct bc_dumpTask bc_dumpTasks[BC_MAXSIMDUMPS];
 extern struct ubik_client *cstruct;
-extern int bc_Dumper();		/* function to do dumps */
-extern int bc_Restorer();	/* function to do restores */
 extern char *whoami;
 extern struct ktc_token ttoken;
-extern char *tailCompPtr();
-extern statusP createStatusNode();
 
 char *loadFile;
 extern afs_int32 lastTaskCode;
 
 #define HOSTADDR(sockaddr) (sockaddr)->sin_addr.s_addr
 
+static int EvalVolumeSet1(struct bc_config *aconfig, struct bc_volumeSet *avs,
+			  struct bc_volumeDump **avols,
+			  struct ubik_client *uclient);
+
+static int EvalVolumeSet2(struct bc_config *aconfig, struct bc_volumeSet *avs,
+			  struct bc_volumeDump **avols,
+			  struct ubik_client *uclient);
+static int DBLookupByVolume(char *volumeName);
+
 int
-bc_EvalVolumeSet(aconfig, avs, avols, uclient)
-     struct bc_config *aconfig;
-     register struct bc_volumeSet *avs;
-     struct bc_volumeDump **avols;
-     struct ubik_client *uclient;
+bc_EvalVolumeSet(struct bc_config *aconfig, 
+		 struct bc_volumeSet *avs, 
+		 struct bc_volumeDump **avols, 
+		 struct ubik_client *uclient)
 {				/*bc_EvalVolumeSet */
-    int code;
+    int code = -1;
     static afs_int32 use = 2;
 
     if (use == 2) {		/* Use EvalVolumeSet2() */
@@ -102,11 +105,10 @@ struct serversort {
 };
 
 afs_int32
-getSPEntries(server, partition, serverlist, ss, ps)
-     afs_uint32 server;
-     afs_int32 partition;
-     struct serversort **serverlist, **ss;
-     struct partitionsort **ps;
+getSPEntries(afs_uint32 server, afs_int32 partition, 
+	     struct serversort **serverlist, 
+	     struct serversort **ss, 
+	     struct partitionsort **ps)
 {
     if (!(*ss) || ((*ss)->ipaddr != server)) {
 	*ps = 0;
@@ -155,9 +157,8 @@ getSPEntries(server, partition, serverlist, ss, ps)
 }
 
 afs_int32
-randSPEntries(serverlist, avols)
-     struct serversort *serverlist;
-     struct bc_volumeDump **avols;
+randSPEntries(struct serversort *serverlist, 
+	      struct bc_volumeDump **avols)
 {
     struct serversort *ss, **pss;
     struct partitionsort *ps, **pps;
@@ -197,12 +198,11 @@ randSPEntries(serverlist, avols)
     return 0;
 }
 
-int
-EvalVolumeSet2(aconfig, avs, avols, uclient)
-     struct bc_config *aconfig;
-     struct bc_volumeSet *avs;
-     struct bc_volumeDump **avols;
-     struct ubik_client *uclient;
+static int
+EvalVolumeSet2(struct bc_config *aconfig, 
+	       struct bc_volumeSet *avs, 
+	       struct bc_volumeDump **avols, 
+	       struct ubik_client *uclient)
 {				/*EvalVolumeSet2 */
     struct bc_volumeEntry *tve;
     struct bc_volumeDump *tavols;
@@ -214,7 +214,7 @@ EvalVolumeSet2(aconfig, avs, avols, uclient)
     struct bc_volumeDump *tvd;
     afs_int32 code = 0, tcode;
     afs_int32 count = 0;
-    struct serversort *servers = 0, *lastserver = 0, *ss = 0;
+    struct serversort *servers = 0, *ss = 0;
     struct partitionsort *ps = 0;
 
     *avols = (struct bc_volumeDump *)0;
@@ -419,12 +419,11 @@ EvalVolumeSet2(aconfig, avs, avols, uclient)
  *	None.
  *-----------------------------------------------------------------------------
  */
-int
-EvalVolumeSet1(aconfig, avs, avols, uclient)
-     struct bc_config *aconfig;
-     struct bc_volumeSet *avs;
-     struct bc_volumeDump **avols;
-     struct ubik_client *uclient;
+static int
+EvalVolumeSet1(struct bc_config *aconfig, 
+	       struct bc_volumeSet *avs,
+	       struct bc_volumeDump **avols, 
+	       struct ubik_client *uclient)
 {				/*EvalVolumeSet1 */
     afs_int32 code;		/*Result of various calls */
     char *errm;
@@ -615,9 +614,7 @@ EvalVolumeSet1(aconfig, avs, avols, uclient)
  *	ptr to a string containing a representation of the date
  */
 char *
-compactDateString(date_long, string, size)
-     afs_int32 *date_long, size;
-     char *string;
+compactDateString(afs_uint32 *date_long, char *string, afs_int32 size)
 {
     struct tm *ltime;
 
@@ -636,8 +633,7 @@ compactDateString(date_long, string, size)
 }
 
 afs_int32
-bc_SafeATOI(anum)
-     char *anum;
+bc_SafeATOI(char *anum)
 {
     afs_int32 total = 0;
 
@@ -655,8 +651,7 @@ bc_SafeATOI(anum)
  *    Return the size in KBytes.
  */
 afs_int32
-bc_FloatATOI(anum)
-     char *anum;
+bc_FloatATOI(char *anum)
 {
     float total = 0;
     afs_int32 rtotal;
@@ -702,8 +697,7 @@ bc_FloatATOI(anum)
 
 /* make a copy of a string so that it can be freed later */
 char *
-bc_CopyString(astring)
-     char *astring;
+bc_CopyString(char *astring)
 {
     afs_int32 tlen;
     char *tp;
@@ -727,8 +721,7 @@ bc_CopyString(astring)
  */
 
 char *
-concatParams(itemPtr)
-     struct cmd_item *itemPtr;
+concatParams(struct cmd_item *itemPtr)
 {
     struct cmd_item *tempPtr;
     afs_int32 length = 0;
@@ -768,12 +761,11 @@ concatParams(itemPtr)
  */
  
 void
-printIfStatus(statusPtr)
-     struct tciStatusS *statusPtr;
+printIfStatus(struct tciStatusS *statusPtr)
 {
     printf("Task %d: %s: ", statusPtr->taskId, statusPtr->taskName);
     if (statusPtr->nKBytes)
-	printf("%ld Kbytes transferred", statusPtr->nKBytes);
+	printf("%ld Kbytes transferred", (long unsigned int) statusPtr->nKBytes);
     if (strlen(statusPtr->volumeName) != 0) {
 	if (statusPtr->nKBytes)
 	    printf(", ");
@@ -803,8 +795,7 @@ printIfStatus(statusPtr)
 }
 
 afs_int32
-getPortOffset(port)
-     char *port;
+getPortOffset(char *port)
 {
     afs_int32 portOffset;
 
@@ -888,11 +879,10 @@ extern struct Lock dispatchLock;
 /* bc_WaitForNoJobs
  *	wait for all jobs to terminate
  */
-bc_WaitForNoJobs()
+int
+bc_WaitForNoJobs(void)
 {
-    afs_int32 wcode = 0;
     int i;
-    int waitmsg = 1;
     int usefulJobRunning = 1;
 
     extern dlqlinkT statusHead;
@@ -951,7 +941,7 @@ bc_JobsCmd(struct cmd_syndesc *as, void *arock)
 	    if (statusPtr->dbDumpId)
 		printf(": DumpID %u", statusPtr->dbDumpId);
 	    if (statusPtr->nKBytes)
-		printf(", %ld Kbytes", statusPtr->nKBytes);
+		printf(", %ld Kbytes", (long int) statusPtr->nKBytes);
 	    if (strlen(statusPtr->volumeName) != 0)
 		printf(", volume %s", statusPtr->volumeName);
 
@@ -1048,8 +1038,6 @@ bc_KillCmd(struct cmd_syndesc *as, void *arock)
     statusP statusPtr;
 
     extern dlqlinkT statusHead;
-    extern statusP findStatus();
-
 
     tp = as->parms[0].items->data;
     if (strchr(tp, '.') == 0) {
@@ -1429,7 +1417,6 @@ bc_VolsetRestoreCmd(struct cmd_syndesc *as, void *arock)
     afs_int32 *ports = NULL;
     afs_int32 portCount = 0;
     afs_int32 code = 0;
-    afs_int32 portoffset = 0;
     char *volsetName;
     struct bc_volumeSet *volsetPtr;	/* Ptr to list of generated volume info */
     struct bc_volumeDump *volsToRestore = (struct bc_volumeDump *)0;
@@ -1602,7 +1589,6 @@ int dontExecute;
 int
 bc_DumpCmd(struct cmd_syndesc *as, void *arock)
 {				/*bc_DumpCmd */
-    static char rn[] = "bc_DumpCmd";	/*Routine name */
     char *dumpPath = NULL;
     char *vsName = NULL;      /*Ptrs to various names */
     struct bc_volumeSet *tvs = NULL; /*Ptr to list of generated volume info */
@@ -1628,8 +1614,6 @@ bc_DumpCmd(struct cmd_syndesc *as, void *arock)
     statusP statusPtr;
 
     extern struct bc_dumpTask bc_dumpTasks[];
-    extern afs_int32 bcdb_FindLastVolClone();
-    extern afs_int32 volImageTime();
 
     code = bc_UpdateDumpSchedule();
     if (code) {
@@ -2158,10 +2142,8 @@ bc_ScanDumpsCmd(struct cmd_syndesc *as, void *arock)
  */
 
 afs_int32
-bc_ParseExpiration(paramPtr, expType, expDate)
-     struct cmd_parmdesc *paramPtr;
-     afs_int32 *expType;
-     afs_int32 *expDate;
+bc_ParseExpiration(struct cmd_parmdesc *paramPtr, afs_int32 *expType, 
+		   afs_int32 *expDate)
 {
     struct cmd_item *itemPtr;
     struct ktime_date kt;
@@ -2297,10 +2279,10 @@ bc_dbVerifyCmd(struct cmd_syndesc *as, void *arock)
 /* deleteDump:
  * Delete a dump. If port is >= 0, it means try to delete from XBSA server
  */
-deleteDump(dumpid, port, force)
-     afs_uint32 dumpid;		/* The dumpid to delete */
-     afs_int32 port;		/* port==-1 means don't go to butc */
-     afs_int32 force;
+int
+deleteDump(afs_uint32 dumpid,		/* The dumpid to delete */
+	   afs_int32 port,		/* port==-1 means don't go to butc */
+	   afs_int32 force)
 {
     afs_int32 code = 0, tcode;
     struct budb_dumpEntry dumpEntry;
@@ -2706,8 +2688,8 @@ struct dumpedVol {
  *	volumeName - volume to lookup
  */
 
-DBLookupByVolume(volumeName)
-     char *volumeName;
+static int
+DBLookupByVolume(char *volumeName)
 {
     struct budb_dumpEntry dumpEntry;
     struct budb_volumeEntry volumeEntry[DBL_MAX_VOLUMES];
@@ -2842,9 +2824,7 @@ struct tapeLink {
  */
 
 afs_int32
-dumpInfo(dumpid, detailFlag)
-     afs_int32 dumpid;
-     afs_int32 detailFlag;
+dumpInfo(afs_int32 dumpid, afs_int32 detailFlag)
 {
     struct budb_dumpEntry dumpEntry;
     struct tapeLink *head = 0;
@@ -3050,8 +3030,7 @@ dumpInfo(dumpid, detailFlag)
 }
 
 int
-compareDump(ptr1, ptr2)
-     struct budb_dumpEntry *ptr1, *ptr2;
+compareDump(struct budb_dumpEntry *ptr1, struct budb_dumpEntry *ptr2)
 {
     if (ptr1->created < ptr2->created)
 	return (-1);
@@ -3061,8 +3040,7 @@ compareDump(ptr1, ptr2)
 }
 
 afs_int32
-printRecentDumps(ndumps)
-     int ndumps;
+printRecentDumps(int ndumps)
 {
     afs_int32 code = 0;
     afs_int32 nextindex, index = 0;
@@ -3073,7 +3051,6 @@ printRecentDumps(ndumps)
     char ds[50];
 
     extern struct udbHandleS udbHandle;
-    extern compareDump();
 
     do {			/* while (nextindex != -1) */
 	/* initialize the dump list */
@@ -3137,8 +3114,6 @@ bc_dumpInfoCmd(struct cmd_syndesc *as, void *arock)
     afs_int32 ndumps;
     afs_int32 code = 0;
 
-    afs_int32 dumpInfo();
-
     if (as->parms[0].items) {
 	if (as->parms[1].items) {
 	    afs_com_err(whoami, 0,
diff --git a/src/bucoord/config.c b/src/bucoord/config.c
index 2801d596d..05e444b40 100644
--- a/src/bucoord/config.c
+++ b/src/bucoord/config.c
@@ -27,17 +27,16 @@ RCSID
 
 struct bc_config *bc_globalConfig;
 
-static
-TrimLine(abuffer, aport)
-     afs_int32 *aport;
-     register char *abuffer;
+#if 0
+static int
+TrimLine(char *abuffer, afs_int32 *aport)
 {
     register int tc;
     char garb[100];
 
     *aport = 0;
     sscanf(abuffer, "%s %u", garb, aport);
-    while (tc = *abuffer) {
+    while ((tc = *abuffer)) {
 	if (tc == ' ') {
 	    *abuffer = 0;
 	    return 0;
@@ -46,13 +45,10 @@ TrimLine(abuffer, aport)
     }
     return 0;
 }
+#endif
 
 FILE *
-bc_open(aconfig, aname, aext, amode)
-     register struct bc_config *aconfig;
-     char *amode;
-     char *aext;
-     char *aname;
+bc_open(struct bc_config *aconfig, char *aname, char *aext, char *amode)
 {
     register FILE *tf;
     char tpath[256];
@@ -66,8 +62,8 @@ bc_open(aconfig, aname, aext, amode)
     return tf;
 }
 
-bc_InitConfig(apath)
-     char *apath;
+int
+bc_InitConfig(char *apath)
 {
     register struct bc_config *tb;
 
@@ -91,11 +87,8 @@ bc_InitConfig(apath)
     return 0;
 }
 
-static
-HostAdd(alist, aname, aport)
-     struct bc_hostEntry **alist;
-     afs_int32 aport;
-     char *aname;
+static int
+HostAdd(struct bc_hostEntry **alist, char *aname, afs_int32 aport)
 {
     register struct bc_hostEntry **tlast, *tentry;
     struct hostent *th;
@@ -131,11 +124,8 @@ HostAdd(alist, aname, aport)
     return 0;
 }
 
-static
-HostDelete(alist, aname, aport)
-     struct bc_hostEntry **alist;
-     afs_int32 aport;
-     char *aname;
+static int
+HostDelete(struct bc_hostEntry **alist, char *aname, afs_int32 aport)
 {
     register struct bc_hostEntry **tlast, *tentry;
 
@@ -154,10 +144,8 @@ HostDelete(alist, aname, aport)
     return 0;
 }
 
-bc_AddTapeHost(aconfig, aname, aport)
-     struct bc_config *aconfig;
-     afs_int32 aport;
-     char *aname;
+int
+bc_AddTapeHost(struct bc_config *aconfig, char *aname, afs_int32 aport)
 {
     register afs_int32 code;
 
@@ -166,10 +154,8 @@ bc_AddTapeHost(aconfig, aname, aport)
     return code;
 }
 
-bc_DeleteTapeHost(aconfig, aname, aport)
-     struct bc_config *aconfig;
-     afs_int32 aport;
-     char *aname;
+int
+bc_DeleteTapeHost(struct bc_config *aconfig, char *aname, afs_int32 aport)
 {
     register afs_int32 code;
 
diff --git a/src/bucoord/dsstub.c b/src/bucoord/dsstub.c
index 7ed4fb73e..b932d2c60 100644
--- a/src/bucoord/dsstub.c
+++ b/src/bucoord/dsstub.c
@@ -43,15 +43,12 @@ static FILE * OpenDump(afs_int32 , char * );
 FILE * OpenTape(char * , char * );
 static afs_int32 ScanForChildren(afs_int32 );
 static afs_int32 DeleteDump(afs_int32 );
-static afs_int32 DeleteTape(char * );
 char * tailCompPtr(char *);
 afs_int32 ScanDumpHdr(register FILE *, char *, char *, afs_int32 *, afs_int32 *,
   afs_int32 *, afs_int32 *);
-static afs_int32 ScanTapeHdr(register FILE *, afs_int32 *, afs_int32 *, afs_int32 *);
 afs_int32 ScanTapeVolume(FILE *, char *, afs_int32 *, char *, afs_int32 *, afs_int32 *,
    afs_int32 *, afs_int32 *);
 afs_int32 ScanVolClone(FILE *, char *, afs_int32 *);
-static int SeekDump(register FILE *afile, afs_int32 apos);
 
 
 /* basic format of a tape file is a file, whose name is "T<tapename>.db", and
@@ -71,9 +68,6 @@ static int SeekDump(register FILE *afile, afs_int32 apos);
  * Note that dumpEndTime is stored and returned in the dump creation time field.
  */
 
-static afs_int32 DeleteDump();
-afs_int32 ScanDumpHdr();
-
 /* return the tape file name corresponding to a particular tape */
 
 static char * TapeName(register char *atapeName)
@@ -144,7 +138,7 @@ static afs_int32 ScanForChildren(afs_int32 aparentID)
 	return -1;
 
     for (tde = readdir(tdir); tde; tde = readdir(tdir)) {
-	code = sscanf(tde->d_name, "D%ld.db", &dumpID);
+	code = sscanf(tde->d_name, "D%ld.db", (long int *) &dumpID);
 	if (code != 1)
 	    continue;
 
@@ -183,6 +177,7 @@ static afs_int32 DeleteDump(afs_int32 adumpID)
     return code;
 }
 
+#if 0
 static afs_int32 DeleteTape(char * atapeName)
 {
     register char *tp;
@@ -191,13 +186,15 @@ static afs_int32 DeleteTape(char * atapeName)
     code = unlink(tp);
     return code;
 }
+#endif
 
 /* tailCompPtr
  *	name is a pathname style name, determine trailing name and return
  *	pointer to it
  */
 
-char * tailCompPtr(char *pathNamePtr)
+char *
+tailCompPtr(char *pathNamePtr)
 {
     char *ptr;
     ptr = strrchr(pathNamePtr, '/');
@@ -237,7 +234,8 @@ ScanDumpHdr(register FILE *afile, char *aname, char *dumpName, afs_int32 *aparen
 	return -1;
     code =
 	sscanf(tbuffer, "%d %d %s %s %ld %ld %ld %ld", &dbmagic, &dbversion,
-	       aname, dumpName, aparent, aincTime, acreateTime, alevel);
+	       aname, dumpName, (long int *) aparent, (long int *) aincTime, 
+	       (long int *) acreateTime, (long int *) alevel);
     if (code != 8)
 	return -1;
 
@@ -248,6 +246,7 @@ ScanDumpHdr(register FILE *afile, char *aname, char *dumpName, afs_int32 *aparen
     return 0;
 }
 
+#if 0
 /* scan a tape header out of a tape file, leaving the file ptr positioned just past the header */
 static afs_int32 ScanTapeHdr(register FILE *afile, afs_int32 *adumpID, afs_int32 *aseq, afs_int32 *adamage)
 {
@@ -258,11 +257,13 @@ static afs_int32 ScanTapeHdr(register FILE *afile, afs_int32 *adumpID, afs_int32
     tp = fgets(tbuffer, sizeof(tbuffer), afile);
     if (!tp)
 	return -1;
-    code = sscanf(tbuffer, "%ld %ld %ld", adumpID, aseq, adamage);
+    code = sscanf(tbuffer, "%ld %ld %ld", (long int *)adumpID, 
+		  (long int *)aseq, (long int *)adamage);
     if (code != 3)
 	return -1;
     return 0;
 }
+#endif
 
 /* ScanTapeVolume
  *	scan a tape volume record from a dump file, leaving the file ptr
@@ -287,8 +288,10 @@ afs_int32 ScanTapeVolume(FILE *afile, char *avolName, afs_int32 *avolID, char *a
 	    return 1;		/* eof */
     }
     code =
-	sscanf(tbuffer, "%s %ld %s %ld %ld %ld %ld", avolName, avolID,
-	       atapeName, apos, aseq, alastp, cloneTime);
+	sscanf(tbuffer, "%s %ld %s %ld %ld %ld %ld", avolName, 
+	       (long int *) avolID, atapeName, (long int *)apos, 
+	       (long int *) aseq, (long int *) alastp, 
+	       (long int *) cloneTime);
     if (code != 7)
 	return -1;		/* bad input line */
     return 0;
@@ -320,6 +323,7 @@ afs_int32 ScanVolClone(FILE *tdump, char *volName, afs_int32 *cloneTime)
     return (-1);
 }
 
+#if 0
 /* seek a dump file (after a header scan has been done) to position apos */
 static int SeekDump(register FILE *afile, afs_int32 apos)
 {
@@ -337,3 +341,4 @@ static int SeekDump(register FILE *afile, afs_int32 apos)
     }
     return 0;
 }
+#endif
diff --git a/src/bucoord/dsvs.c b/src/bucoord/dsvs.c
index d65c50323..70839a35f 100644
--- a/src/bucoord/dsvs.c
+++ b/src/bucoord/dsvs.c
@@ -35,17 +35,12 @@ RCSID
 
 #include <afs/bubasics.h>
 #include "bc.h"
-
-static char db_dsvs = 0;	/*Assume debugging output turned off */
-static char mn[] = "dsvs";	/*Module name */
-
+#include "bucoord_prototypes.h"
+    
 struct ubik_client *cstructp;	/*Ptr to Ubik client structure */
 
-extern struct bc_volumeSet *bc_FindVolumeSet(struct bc_config *cf,
-					     char *name);
-
-static FreeVolumeEntryList();
-static FreeVolumeEntry();
+static int FreeVolumeEntryList(struct bc_volumeEntry *aentry);
+static int FreeVolumeEntry(struct bc_volumeEntry *aentry);
 
 /* Code to maintain dump schedule and volume set abstractions.
  * A volume set looks like this:
@@ -56,9 +51,7 @@ static FreeVolumeEntry();
 
 /* get partition id from a name */
 afs_int32
-bc_GetPartitionID(aname, aval)
-     afs_int32 *aval;
-     char *aname;
+bc_GetPartitionID(char *aname, afs_int32 *aval)
 {
 
     /*bc_GetPartitionID */
@@ -132,9 +125,7 @@ bc_GetPartitionID(aname, aval)
  */
 
 int
-bc_ParseHost(aname, asockaddr)
-     char *aname;
-     struct sockaddr_in *asockaddr;
+bc_ParseHost(char *aname, struct sockaddr_in *asockaddr)
 
 {				/*bc_ParseHost */
 
@@ -306,10 +297,9 @@ bc_DeleteVolumeItem(struct bc_config *aconfig, char *avolName,
     return -2;			/* not found */
 }
 
-bc_AddVolumeItem(aconfig, avolName, ahost, apart, avol)
-     struct bc_config *aconfig;
-     char *avolName;
-     char *ahost, *apart, *avol;
+int
+bc_AddVolumeItem(struct bc_config *aconfig, char *avolName, char *ahost, 
+		 char *apart, char *avol)
 {
     struct bc_volumeSet *tset;
     register struct bc_volumeEntry **tlast, *tentry;
@@ -373,11 +363,9 @@ bc_FindVolumeSet(struct bc_config *aconfig, char *aname)
  *	expType - absolute or relative
  */
 
-bc_CreateDumpSchedule(aconfig, adumpName, expDate, expType)
-     struct bc_config *aconfig;
-     char *adumpName;
-     afs_int32 expDate;
-     afs_int32 expType;
+int 
+bc_CreateDumpSchedule(struct bc_config *aconfig, char *adumpName, 
+		      afs_int32 expDate, afs_int32 expType)
 {
     register struct bc_dumpSchedule *tdump;
     struct bc_dumpSchedule *parent, *node;
@@ -416,10 +404,9 @@ bc_CreateDumpSchedule(aconfig, adumpName, expDate, expType)
  * list of dumps.  Note that this leaves the sibling pointers damaged (pointing
  * to strange places), so we must call bc_ProcessDumpSchedule when we're done.
  */
-
-bc_DeleteDumpScheduleAddr(aconfig, adumpAddr)
-     struct bc_config *aconfig;
-     struct bc_dumpSchedule *adumpAddr;
+int
+bc_DeleteDumpScheduleAddr(struct bc_config *aconfig, 
+                          struct bc_dumpSchedule *adumpAddr)
 {
     register struct bc_dumpSchedule **tlast, *tdump;
     register struct bc_dumpSchedule *tnext;
@@ -455,9 +442,7 @@ bc_DeleteDumpScheduleAddr(aconfig, adumpAddr)
  */
 
 struct bc_dumpSchedule *
-bc_FindDumpSchedule(aconfig, aname)
-     char *aname;
-     struct bc_config *aconfig;
+bc_FindDumpSchedule(struct bc_config *aconfig, char *aname)
 {
     register struct bc_dumpSchedule *tds;
     for (tds = aconfig->dsched; tds; tds = tds->next) {
@@ -471,9 +456,8 @@ bc_FindDumpSchedule(aconfig, aname)
  *	Delete dump node adumpName from the dump schedule
  */
 
-bc_DeleteDumpSchedule(aconfig, adumpName)
-     struct bc_config *aconfig;
-     char *adumpName;
+int
+bc_DeleteDumpSchedule(struct bc_config *aconfig, char *adumpName)
 {
     register struct bc_dumpSchedule *tdump;
 
@@ -503,8 +487,8 @@ bc_DeleteDumpSchedule(aconfig, adumpName)
  * of dump schedule nodes. It probably will never matter
  */
 
-bc_ProcessDumpSchedule(aconfig)
-     register struct bc_config *aconfig;
+int
+bc_ProcessDumpSchedule(struct bc_config *aconfig)
 {
     register struct bc_dumpSchedule *tds;
     struct bc_dumpSchedule *parentptr, *nodeptr;
@@ -555,11 +539,9 @@ bc_ProcessDumpSchedule(aconfig)
  */
 
 int
-FindDump(aconfig, nodeString, parentptr, nodeptr)
-     struct bc_config *aconfig;
-     char *nodeString;
-     struct bc_dumpSchedule **parentptr;
-     struct bc_dumpSchedule **nodeptr;
+FindDump(struct bc_config *aconfig, char *nodeString, 
+	 struct bc_dumpSchedule **parentptr, 
+	 struct bc_dumpSchedule **nodeptr)
 {
     struct bc_dumpSchedule *dsptr;
     char *separator;
diff --git a/src/bucoord/dump.c b/src/bucoord/dump.c
index 03578888c..cfcb3b8f2 100644
--- a/src/bucoord/dump.c
+++ b/src/bucoord/dump.c
@@ -39,15 +39,11 @@ RCSID
 
 #include "bc.h"
 #include "error_macros.h"
+#include "bucoord_prototypes.h"
 
 struct bc_dumpTask bc_dumpTasks[BC_MAXSIMDUMPS];
 
-extern char *bc_CopyString();
-extern void bc_HandleMisc();
 extern char *whoami;
-extern char *tailCompPtr();
-extern statusP createStatusNode();
-extern afs_int32 bc_jobNumber();
 
 extern afs_int32 lastTaskCode;
 
@@ -59,7 +55,8 @@ extern afs_int32 lastTaskCode;
  *	aindex - index into dumpTask array, contains all the information 
  * 		 relevant to the dump
  */
-bc_Dumper(aindex)
+int
+bc_Dumper(int aindex)
 {
     struct rx_connection *tconn;
     register struct bc_volumeDump *tde;
@@ -179,8 +176,7 @@ bc_Dumper(aindex)
  */
 
 void
-freeDumpTaskVolumeList(vdptr)
-     struct bc_volumeDump *vdptr;
+freeDumpTaskVolumeList(struct bc_volumeDump *vdptr)
 {
     struct bc_volumeDump *nextVdPtr;
 
@@ -240,24 +236,14 @@ bc_DmpRstStart(void *param)
  *		bc_Restorer for doing restores
  */
 
-bc_StartDmpRst(aconfig, adname, avname, avolsToDump, adestServer,
-	       adestPartition, afromDate, anewExt, aoldFlag, aparent, alevel,
-	       aproc, ports, portCount, dsptr, append, dontExecute)
-     struct bc_config *aconfig;
-     char *adname;
-     char *avname;
-     struct bc_volumeDump *avolsToDump;
-     struct sockaddr_in *adestServer;
-     afs_int32 adestPartition;
-     afs_int32 afromDate;
-     char *anewExt;
-     int aoldFlag;
-     afs_int32 aparent, alevel;
-     int (*aproc) ();
-     afs_int32 *ports;
-     afs_int32 portCount;
-     struct bc_dumpSchedule *dsptr;
-     int append, dontExecute;
+int
+bc_StartDmpRst(struct bc_config *aconfig, char *adname, char *avname, 
+	       struct bc_volumeDump *avolsToDump, 
+	       struct sockaddr_in *adestServer,
+	       afs_int32 adestPartition, afs_int32 afromDate, char *anewExt, 
+	       int aoldFlag, afs_int32 aparent, afs_int32 alevel,
+	       int (*aproc) (int), afs_int32 *ports, afs_int32 portCount, 
+	       struct bc_dumpSchedule *dsptr, int append, int dontExecute)
 {
     register int i;
     register afs_int32 code;
@@ -339,9 +325,7 @@ bc_StartDmpRst(aconfig, adname, avname, avolsToDump, adestServer,
  */
 
 afs_int32
-bc_FindDumpSlot(dumpID, port)
-     afs_int32 dumpID;
-     afs_int32 port;
+bc_FindDumpSlot(afs_int32 dumpID, afs_int32 port)
 {
     int i;
 
@@ -361,11 +345,9 @@ bc_FindDumpSlot(dumpID, port)
  *	label a tape
  */
 
-bc_LabelTape(afsname, pname, size, config, port)
-     char *afsname, *pname;
-     struct bc_config *config;
-     afs_int32 port;
-     afs_int32 size;
+int
+bc_LabelTape(char *afsname, char *pname, afs_int32 size, 
+	     struct bc_config *config, afs_int32 port)
 {
     struct rx_connection *tconn;
     afs_int32 code = 0;
@@ -411,9 +393,8 @@ bc_LabelTape(afsname, pname, size, config, port)
  *	a tape
  */
 
-bc_ReadLabel(config, port)
-     struct bc_config *config;
-     afs_int32 port;
+int
+bc_ReadLabel(struct bc_config *config, afs_int32 port)
 {
     struct rx_connection *tconn;
     struct tc_tapeLabel label;
@@ -445,19 +426,17 @@ bc_ReadLabel(config, port)
 	printf("Tape read was labelled : <NULL>  size : %u\n", label.size);
     } else if (!label.tapeId) {
 	printf("Tape read was labelled : %s size : %lu Kbytes\n", tname,
-	       label.size);
+	       (long unsigned int) label.size);
     } else {
 	printf("Tape read was labelled : %s (%lu) size : %lu Kbytes\n", tname,
-	       label.tapeId, label.size);
+	       (long unsigned int) label.tapeId, (long unsigned int) label.size);
     }
 
     return 0;
 }
 
-bc_ScanDumps(config, dbAddFlag, port)
-     struct bc_config *config;
-     afs_int32 dbAddFlag;
-     afs_int32 port;
+int
+bc_ScanDumps(struct bc_config *config, afs_int32 dbAddFlag, afs_int32 port)
 {
     struct rx_connection *tconn;
     statusP statusPtr;
@@ -493,12 +472,9 @@ bc_ScanDumps(config, dbAddFlag, port)
 
 /* get a connection to the tape controller */
 afs_int32
-bc_GetConn(aconfig, aport, tconn)
-     struct bc_config *aconfig;
-     afs_int32 aport;
-     struct rx_connection **tconn;
+bc_GetConn(struct bc_config *aconfig, afs_int32 aport, 
+	   struct rx_connection **tconn)
 {
-    afs_int32 code = 0;
     afs_uint32 host;
     unsigned short port;
     static struct rx_securityClass *rxsc;
@@ -536,8 +512,8 @@ bc_GetConn(aconfig, aport, tconn)
  *	-1 - not compatible
  */
 
-CheckTCVersion(tconn)
-     struct rx_connection *tconn;
+int
+CheckTCVersion(struct rx_connection *tconn)
 {
     struct tc_tcInfo tci;
     afs_int32 code;
@@ -552,10 +528,9 @@ CheckTCVersion(tconn)
     return 0;
 }
 
-ConnectButc(config, port, tconn)
-     struct bc_config *config;
-     afs_int32 port;
-     struct rx_connection **tconn;
+int
+ConnectButc(struct bc_config *config, afs_int32 port, 
+	    struct rx_connection **tconn)
 {
     afs_int32 code;
 
diff --git a/src/bucoord/dump_sched.c b/src/bucoord/dump_sched.c
index 04d0fdff0..0d0593cca 100644
--- a/src/bucoord/dump_sched.c
+++ b/src/bucoord/dump_sched.c
@@ -35,17 +35,17 @@ RCSID
 #include <afs/bubasics.h>
 #include "bc.h"
 #include "error_macros.h"
+#include "bucoord_prototypes.h"
 
 /* code to manage dump schedules 
  * specific to the ubik database implementation
  */
 
-afs_int32 bc_UpdateDumpSchedule();
 extern struct bc_config *bc_globalConfig;
 extern struct udbHandleS udbHandle;
 extern char *whoami;
 
-static ListDumpSchedule();
+static int ListDumpSchedule(struct bc_dumpSchedule *adump, int alevel);
 
 /* ------------------------------------
  * command level routines
@@ -68,8 +68,6 @@ bc_AddDumpCmd(struct cmd_syndesc *as, void *arock)
     register struct cmd_item *ti;
     udbClientTextP ctPtr;
 
-    afs_int32 bc_ParseExpiration();
-
     /* if an expiration date has been specified */
     if (as->parms[1].items) {
 	code = bc_ParseExpiration(&as->parms[1], &expType, &expDate);
@@ -209,8 +207,6 @@ ListDumpSchedule(register struct bc_dumpSchedule *adump, int alevel)
     register int i;
     register struct bc_dumpSchedule *child;
 
-    char *tailCompPtr();
-
     /* sanity check for loops */
     if (alevel > 100) {
 	printf("backup: recursing listing dump schedule\n");
@@ -307,8 +303,6 @@ bc_SetExpCmd(struct cmd_syndesc *as, void *arock)
     udbClientTextP ctPtr;
     register int code;
 
-    afs_int32 bc_ParseExpiration();
-
     /* if an expiration date has been specified */
     if (as->parms[1].items) {
 	code = bc_ParseExpiration(&as->parms[1], &expType, &expDate);
@@ -379,7 +373,8 @@ bc_SetExpCmd(struct cmd_syndesc *as, void *arock)
  * ------------------------------------
  */
 
-bc_ParseDumpSchedule()
+int
+bc_ParseDumpSchedule(void)
 {
     char tbuffer[1024];
     char dsname[256], period[64];
@@ -462,15 +457,14 @@ bc_ParseDumpSchedule()
     return 0;
 }
 
-
-bc_SaveDumpSchedule()
+int
+bc_SaveDumpSchedule(void)
 {
     struct bc_dumpSchedule *tdump;
     udbClientTextP ctPtr;
     afs_int32 code = 0;
 
     extern struct bc_config *bc_globalConfig;
-    extern afs_int32 filesize();
 
     /* setup the right ptr */
     ctPtr = &bc_globalConfig->configText[TB_DUMPSCHEDULE];
@@ -521,7 +515,7 @@ bc_SaveDumpSchedule()
  */
 
 afs_int32
-bc_UpdateDumpSchedule()
+bc_UpdateDumpSchedule(void)
 {
     struct bc_dumpSchedule *dumpPtr, *nextDumpPtr;
     struct udbHandleS *uhptr = &udbHandle;
diff --git a/src/bucoord/expire.c b/src/bucoord/expire.c
index b7e7c904e..1f003b3c8 100644
--- a/src/bucoord/expire.c
+++ b/src/bucoord/expire.c
@@ -382,10 +382,8 @@ RelDatetoString(datePtr)
  */
 
 afs_int32
-bc_ParseExpiration(paramPtr, expType, expDate)
-     struct cmd_parmdesc *paramPtr;
-     afs_int32 *expType;
-     afs_int32 *expDate;
+bc_ParseExpiration(struct cmd_parmdesc *paramPtr, afs_int32 *expType, 
+		   afs_int32 *expDate)
 {
     struct cmd_item *itemPtr, *tempPtr;
     struct ktime_date kt;
diff --git a/src/bucoord/main.c b/src/bucoord/main.c
index 20fbe5dfa..f229974aa 100644
--- a/src/bucoord/main.c
+++ b/src/bucoord/main.c
@@ -15,6 +15,8 @@ RCSID
 
 #include <afs/stds.h>
 #include <sys/types.h>
+#include <sys/stat.h>
+
 #ifdef	AFS_AIX32_ENV
 #include <signal.h>
 #endif
@@ -25,6 +27,7 @@ RCSID
 #include <netinet/in.h>
 #include <netdb.h>
 #endif
+
 #include <errno.h>
 #include <afs/cmd.h>
 #include <rx/rx.h>
@@ -50,37 +53,6 @@ RCSID
 int localauth, interact;
 char tcell[64];
 
-extern int bc_AddDumpCmd();
-extern int bc_AddHostCmd();
-extern int bc_AddVolEntryCmd();
-extern int bc_AddVolSetCmd();
-/* extern int bc_CheckDumpStatCmd(); */
-extern int bc_DeleteDumpCmd();
-extern int bc_DeleteHostCmd();
-extern int bc_DeleteVolEntryCmd();
-extern int bc_DeleteVolSetCmd();
-extern int bc_DiskRestoreCmd();
-extern int bc_VolsetRestoreCmd();
-extern int bc_DumpCmd();
-extern int bc_GetTapeStatusCmd();
-extern int bc_JobsCmd();
-extern int bc_KillCmd();
-extern int bc_LabelTapeCmd();
-extern int bc_ListDumpScheduleCmd();
-extern int bc_ListHostsCmd();
-extern int bc_ListVolSetCmd();
-extern int bc_QuitCmd();
-extern int bc_ReadLabelCmd();
-extern int bc_ScanDumpsCmd();
-extern int bc_SetExpCmd();
-extern int bc_VolRestoreCmd();
-extern int bc_dblookupCmd();
-extern int bc_dbVerifyCmd();
-extern int bc_deleteDumpCmd();
-extern int bc_dumpInfoCmd();
-extern int bc_restoreDbCmd();
-extern int bc_saveDbCmd();
-
 /*
  * Global configuration information for the Backup Coordinator.
  */
@@ -95,7 +67,8 @@ char *whoami = "backup";
 
 /* dummy routine for the audit work.  It should do nothing since audits */
 /* occur at the server level and bos is not a server. */
-osi_audit()
+int
+osi_audit(void)
 {
     return 0;
 }
@@ -105,7 +78,7 @@ osi_audit()
  * in this module.
  */
 void
-InitErrTabs()
+InitErrTabs(void)
 {
     initialize_ACFG_error_table();
     initialize_KA_error_table();
@@ -126,8 +99,7 @@ InitErrTabs()
  * not dealt with by standard errno and com_err stuff.
  */
 void
-bc_HandleMisc(code)
-     afs_int32 code;
+bc_HandleMisc(afs_int32 code)
 {
     if (((code <= VMOVED) && (code >= VSALVAGE)) || (code < 0)) {
 	switch (code) {
@@ -176,13 +148,12 @@ bc_HandleMisc(code)
 }
 
 /* Return true if line is all whitespace */
-static
-LineIsBlank(aline)
-     register char *aline;
+static int
+LineIsBlank(char *aline)
 {
     register int tc;
 
-    while (tc = *aline++)
+    while ((tc = *aline++))
 	if ((tc != ' ') && (tc != '\t') && (tc != '\n'))
 	    return (0);
 
@@ -195,11 +166,10 @@ LineIsBlank(aline)
  */
 
 afs_int32
-bc_InitTextConfig()
+bc_InitTextConfig(void)
 {
     udbClientTextP ctPtr;
     int i;
-    afs_int32 code = 0;
 
     extern struct bc_config *bc_globalConfig;
 
@@ -237,7 +207,7 @@ bc_InitTextConfig()
  */
 
 static int
-backupInit()
+backupInit(void)
 {
     register afs_int32 code;
     static int initd = 0;	/* ever called? */
@@ -382,10 +352,9 @@ struct Lock dispatchLock;	/* lock on the Dispatch call */
 #define unlock_Dispatch()   ReleaseWriteLock(&dispatchLock)
 
 afs_int32
-doDispatch(targc, targv, dispatchCount)
-     char *targv[MAXV];
-     afs_int32 targc;
-     afs_int32 dispatchCount;	/* to prevent infinite recursion */
+doDispatch(afs_int32 targc,
+	   char *targv[MAXV], 
+	   afs_int32 dispatchCount) /* to prevent infinite recursion */
 {
     char *sargv[MAXV];
     afs_int32 sargc;
@@ -466,8 +435,7 @@ bc_interactCmd(struct cmd_syndesc *as, void *arock)
 }
 
 static void
-add_std_args(ts)
-     register struct cmd_syndesc *ts;
+add_std_args(struct cmd_syndesc *ts)
 {
     cmd_Seek(ts, 14);
     cmd_AddParm(ts, "-localauth", CMD_FLAG, CMD_OPTIONAL,
@@ -475,10 +443,8 @@ add_std_args(ts)
     cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cell name");
 }
 
-
-main(argc, argv)
-     int argc;
-     char **argv;
+int
+main(int argc, char **argv)
 {				/*main */
     char *targv[MAXV];		/*Ptr to parsed argv stuff */
     afs_int32 targc;		/*Num parsed arguments */
diff --git a/src/bucoord/regex.c b/src/bucoord/regex.c
index 435749f1a..25dd0947f 100644
--- a/src/bucoord/regex.c
+++ b/src/bucoord/regex.c
@@ -72,6 +72,8 @@
  *	    regular expression encountered.
  */
 
+#include "regex.h"
+
 /*
  * constants for re's
  */
@@ -93,16 +95,15 @@
 static char expbuf[ESIZE], *braslist[NBRA], *braelist[NBRA];
 static char circf;
 
-static int advance();
-static int backref();
-static int cclass();
+static int advance(char *, char *);
+static int backref(int i, char *);
+static int cclass(char *, char, int);
 
 /*
  * compile the regular expression argument into a dfa
  */
 char *
-re_comp(sp)
-     register char *sp;
+re_comp(const char *sp)
 {
     register int c;
     register char *ep = expbuf;
@@ -221,9 +222,7 @@ re_comp(sp)
 }
 
 static int
-cclass(set, c, af)
-     register char *set, c;
-     int af;
+cclass(char *set, char c, int af)
 {
     register int n;
 
@@ -236,10 +235,8 @@ cclass(set, c, af)
     return (!af);
 }
 
-static
-backref(i, lp)
-     register int i;
-     register char *lp;
+static int
+backref(int i, char *lp)
 {
     register char *bp;
 
@@ -254,8 +251,7 @@ backref(i, lp)
  * try to match the next thing in the dfa
  */
 static int
-advance(lp, ep)
-     register char *lp, *ep;
+advance(char *lp, char *ep)
 {
     register char *curlp;
     int ct, i;
@@ -297,11 +293,11 @@ advance(lp, ep)
 	    return (0);
 
 	case CBRA:
-	    braslist[*ep++] = lp;
+	    braslist[(int) *ep++] = lp;
 	    continue;
 
 	case CKET:
-	    braelist[*ep++] = lp;
+	    braelist[(int) *ep++] = lp;
 	    continue;
 
 	case CBACK:
@@ -321,7 +317,7 @@ advance(lp, ep)
 	    while (backref(i, lp))
 		lp += ct;
 	    while (lp >= curlp) {
-		if (rv = advance(lp, ep))
+		if ((rv = advance(lp, ep)))
 		    return (rv);
 		lp -= ct;
 	    }
@@ -348,7 +344,7 @@ advance(lp, ep)
 	  star:
 	    do {
 		lp--;
-		if (rv = advance(lp, ep))
+		if ((rv = advance(lp, ep)))
 		    return (rv);
 	    } while (lp > curlp);
 	    return (0);
@@ -362,8 +358,7 @@ advance(lp, ep)
  * match the argument string against the compiled re
  */
 int
-re_exec(p1)
-     register char *p1;
+re_exec(const char *p1)
 {
     register char *p2 = expbuf;
     register int c;
@@ -383,7 +378,7 @@ re_exec(p1)
 	do {
 	    if (*p1 != c)
 		continue;
-	    if (rv = advance(p1, p2))
+	    if ((rv = advance(p1, p2)))
 		return (rv);
 	} while (*p1++);
 	return (0);
@@ -392,7 +387,7 @@ re_exec(p1)
      * regular algorithm
      */
     do
-	if (rv = advance(p1, p2))
+	if ((rv = advance(p1, p2)))
 	    return (rv);
     while (*p1++);
     return (0);
diff --git a/src/bucoord/regex.h b/src/bucoord/regex.h
new file mode 100644
index 000000000..8fb6b0fca
--- /dev/null
+++ b/src/bucoord/regex.h
@@ -0,0 +1,14 @@
+/* Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ * 
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+#ifndef _BUCOORD_REGEX_H
+#define _BUCOORD_REGEX_H
+/* regex.c */
+extern char *re_comp(const char *sp);
+extern int re_exec(const char *p1);
+#endif
diff --git a/src/bucoord/restore.c b/src/bucoord/restore.c
index 913cf3604..68145424c 100644
--- a/src/bucoord/restore.c
+++ b/src/bucoord/restore.c
@@ -36,6 +36,7 @@ RCSID
 #include <afs/budb.h>
 #include <afs/vlserver.h>
 #include "error_macros.h"
+#include "bucoord_prototypes.h"
 
 extern struct bc_dumpTask bc_dumpTasks[BC_MAXSIMDUMPS];
 extern char *whoami;
@@ -92,13 +93,12 @@ struct bc_tapeItem {
 };
 
 /* strip .backup from the end of a name */
-static
-StripBackup(aname)
-     register char *aname;
+static int
+StripBackup(char *aname)
 {
     int j;
 
-    if (j = BackupName(aname)) {
+    if ((j = BackupName(aname))) {
 	aname[j] = 0;
 	return 0;
     }
@@ -106,8 +106,7 @@ StripBackup(aname)
 }
 
 int
-BackupName(aname)
-     char *aname;
+BackupName(char *aname)
 {
     int j;
 
@@ -119,8 +118,8 @@ BackupName(aname)
     return 0;
 }
 
-extractTapeSeq(tapename)
-     char *tapename;
+int
+extractTapeSeq(char *tapename)
 {
     char *sptr;
 
@@ -132,8 +131,7 @@ extractTapeSeq(tapename)
 }
 
 void
-viceName(value)
-     long value;
+viceName(long value)
 {
     char *alph;
     int r;
@@ -151,8 +149,8 @@ viceName(value)
  * entry:
  *	aindex - index into bc_dumpTasks that describes this dump.
  */
-bc_Restorer(aindex)
-     afs_int32 aindex;
+int
+bc_Restorer(afs_int32 aindex)
 {
     struct bc_dumpTask *dumpTaskPtr;
 
@@ -184,7 +182,7 @@ bc_Restorer(aindex)
 
     struct dumpinfo *dumpinfolist = NULL;
     struct dumpinfo *pdi, *ndi, *di, *dlevels;
-    struct volinfo *pvi, *nvi, *vi;
+    struct volinfo *nvi, *vi;
     afs_int32 lvl, lv;
     int num_dlevels = 20;
 
@@ -195,9 +193,6 @@ bc_Restorer(aindex)
     time_t did;
     int foundtape, c;
 
-    extern statusP createStatusNode();
-    extern statusP findStatus();
-
     dlevels = (struct dumpinfo *) malloc(num_dlevels * sizeof(*dlevels));
 
     dumpTaskPtr = &bc_dumpTasks[aindex];
diff --git a/src/bucoord/server.c b/src/bucoord/server.c
index b7672ec89..d7aad5de0 100644
--- a/src/bucoord/server.c
+++ b/src/bucoord/server.c
@@ -22,10 +22,9 @@ RCSID
 #include <rx/rx.h>
 
 /* services available on incoming message port */
-BC_Print(acall, acode, aflags, amessage)
-     struct rx_call *acall;
-     afs_int32 acode, aflags;
-     char *amessage;
+int
+BC_Print(struct rx_call *acall, afs_int32 acode, afs_int32 aflags, 
+	 char *amessage)
 {
     struct rx_connection *tconn;
     struct rx_peer *tpeer;
diff --git a/src/bucoord/status.c b/src/bucoord/status.c
index 956d93f75..5a57f85e9 100644
--- a/src/bucoord/status.c
+++ b/src/bucoord/status.c
@@ -27,7 +27,7 @@ RCSID
 #include <afs/bubasics.h>
 #include "bc.h"
 #include "error_macros.h"
-
+#include "bucoord_prototypes.h"
 
 extern dlqlinkT statusHead;	/* chain of status blocks */
 extern struct Lock statusQueueLock;	/* access control for status chain */
@@ -39,7 +39,7 @@ extern struct Lock cmdLineLock;	/* lock on the cmdLine */
  */
 
 void
-initStatus()
+initStatus(void)
 {
     dlqInit(&statusHead);
     Lock_Init(&statusQueueLock);
@@ -49,25 +49,24 @@ initStatus()
 /* lock managment */
 
 void
-lock_Status()
+lock_Status(void)
 {
     ObtainWriteLock(&statusQueueLock);
 }
 
 void
-unlock_Status()
+unlock_Status(void)
 {
     ReleaseWriteLock(&statusQueueLock);
 }
 
 void
-lock_cmdLine()
+lock_cmdLine(void)
 {
     ObtainWriteLock(&cmdLineLock);
 }
-
 void
-unlock_cmdLine()
+unlock_cmdLine(void)
 {
     ReleaseWriteLock(&cmdLineLock);
 }
@@ -75,14 +74,10 @@ unlock_cmdLine()
 /* general */
 
 void
-clearStatus(taskId, flags)
-     afs_uint32 taskId;
-     afs_uint32 flags;
+clearStatus(afs_uint32 taskId, afs_uint32 flags)
 {
     statusP ptr;
 
-    extern statusP findStatus();
-
     ObtainWriteLock(&statusQueueLock);
     ptr = findStatus(taskId);
     if (ptr == 0) {
@@ -95,7 +90,7 @@ clearStatus(taskId, flags)
 }
 
 statusP
-createStatusNode()
+createStatusNode(void)
 {
     statusP ptr;
 
@@ -115,8 +110,7 @@ createStatusNode()
 }
 
 void
-deleteStatusNode(ptr)
-     statusP ptr;
+deleteStatusNode(statusP ptr)
 {
     ObtainWriteLock(&statusQueueLock);
     dlqUnlink((dlqlinkP) ptr);
@@ -128,8 +122,7 @@ deleteStatusNode(ptr)
 }
 
 statusP
-findStatus(taskId)
-     afs_uint32 taskId;
+findStatus(afs_uint32 taskId)
 {
     statusP ptr = 0;
     dlqlinkP dlqPtr;
@@ -147,9 +140,7 @@ findStatus(taskId)
 }
 
 void
-setStatus(taskId, flags)
-     afs_uint32 taskId;
-     afs_uint32 flags;
+setStatus(afs_uint32 taskId, afs_uint32 flags)
 {
     statusP ptr;
 
diff --git a/src/bucoord/tape_hosts.c b/src/bucoord/tape_hosts.c
index 73c3fd8b0..7883fff3f 100644
--- a/src/bucoord/tape_hosts.c
+++ b/src/bucoord/tape_hosts.c
@@ -29,12 +29,12 @@ RCSID
 #include "bc.h"
 #include "error_macros.h"
 #include <errno.h>
-
+#include "bucoord_prototypes.h"
+    
 /* code to manage tape hosts
  * specific to the ubik database implementation
  */
 
-afs_int32 bc_UpdateHosts();
 extern struct bc_config *bc_globalConfig;
 extern struct udbHandleS udbHandle;
 extern char *whoami;
@@ -198,7 +198,8 @@ bc_ListHostsCmd(struct cmd_syndesc *as, void *arock)
  * ------------------------------------
  */
 
-bc_ClearHosts()
+int
+bc_ClearHosts(void)
 {
     register struct bc_hostEntry *tentry, *temp;
 
@@ -223,7 +224,7 @@ bc_ClearHosts()
  */
 
 int
-bc_ParseHosts()
+bc_ParseHosts(void)
 {
     char tbuffer[256];
     char hostName[256];
@@ -296,7 +297,8 @@ bc_ParseHosts()
  *	2) transmit to ubik server
  */
 
-bc_SaveHosts()
+int
+bc_SaveHosts(void)
 {
     register afs_int32 code = 0;
 
@@ -347,7 +349,7 @@ bc_SaveHosts()
 }
 
 afs_int32
-bc_UpdateHosts()
+bc_UpdateHosts(void)
 {
     struct udbHandleS *uhptr = &udbHandle;
     udbClientTextP ctPtr;
diff --git a/src/bucoord/ubik_db_if.c b/src/bucoord/ubik_db_if.c
index 8e72148f3..b7c50c869 100644
--- a/src/bucoord/ubik_db_if.c
+++ b/src/bucoord/ubik_db_if.c
@@ -37,17 +37,7 @@ RCSID
 
 #include "bc.h"
 #include "error_macros.h"
-
-/* protos */
-afs_int32 bcdb_AddVolume(register struct budb_volumeEntry *);
-afs_int32 bcdb_AddVolumes(register struct budb_volumeEntry *, afs_int32 );
-afs_int32 bcdb_CreateDump(register struct budb_dumpEntry *) ;
-afs_int32 bcdb_deleteDump(afs_int32, afs_int32, afs_int32, budb_dumpsList *);
-/*note the pinter to the function comes from ubik/ubikclient ubik_Call function.*/
-afs_int32 bcdb_listDumps (afs_int32, afs_int32,afs_int32,afs_int32, budb_dumpsList *,
- budb_dumpsList *);
-afs_int32 bcdb_DeleteVDP(char *, char *, afs_int32 );
-afs_int32 bcdb_FindClone(afs_int32, char *, afs_int32 *);
+#include "bucoord_prototypes.h"
 
 extern char *whoami;
 
@@ -109,7 +99,9 @@ afs_int32 bcdb_deleteDump(afs_int32 dumpID, afs_int32 fromTime, afs_int32 toTime
     return (code);
 }
 
-afs_int32 bcdb_listDumps (afs_int32 sflags, afs_int32 groupId,afs_int32 fromTime, afs_int32 toTime,budb_dumpsList *dumps, budb_dumpsList *flags)
+afs_int32 bcdb_listDumps (afs_int32 sflags, afs_int32 groupId,
+			  afs_int32 fromTime, afs_int32 toTime,
+			  budb_dumpsList *dumps, budb_dumpsList *flags)
 {
     afs_int32 code;
     budb_dumpsList dumpsList, *dumpsPtr;
@@ -185,10 +177,9 @@ afs_int32 bcdb_FindClone(afs_int32 dumpID, char *volName, afs_int32 *clonetime)
  *      the current multiple bcdb_ call algorithm.
  */
 
-bcdb_FindDump(volumeName, beforeDate, deptr)
-     char *volumeName;
-     afs_int32 beforeDate;
-     struct budb_dumpEntry *deptr;
+int
+bcdb_FindDump(char *volumeName, afs_int32 beforeDate, 
+	      struct budb_dumpEntry *deptr)
 {
     afs_int32 code;
     code =
@@ -203,9 +194,8 @@ bcdb_FindDump(volumeName, beforeDate, deptr)
  *	dumpID - id to lookup
  * exit:
  */
-bcdb_FindDumpByID(dumpID, deptr)
-     afs_int32 dumpID;
-     register struct budb_dumpEntry *deptr;
+int
+bcdb_FindDumpByID(afs_int32 dumpID, struct budb_dumpEntry *deptr)
 {
     register afs_int32 code;
     afs_int32 nextindex;
@@ -265,11 +255,8 @@ bcdb_FindDumpByID(dumpID, deptr)
  */
 
 afs_int32
-bcdb_FindLastVolClone(volSetName, dumpName, volName, clonetime)
-     char *volSetName;
-     char *dumpName;
-     char *volName;
-     afs_int32 *clonetime;
+bcdb_FindLastVolClone(char *volSetName, char *dumpName, char *volName, 
+		      afs_int32 *clonetime)
 {
     /* server notes
      * search by dumpName
@@ -296,10 +283,9 @@ bcdb_FindLastVolClone(volSetName, dumpName, volName, clonetime)
  *      Need new routine since params are two strings
  */
 
-bcdb_FindLatestDump(volSetName, dumpPath, deptr)
-     char *volSetName;
-     char *dumpPath;
-     struct budb_dumpEntry *deptr;
+int
+bcdb_FindLatestDump(char *volSetName, char *dumpPath, 
+		    struct budb_dumpEntry *deptr)
 {
     afs_int32 code;
     code =
@@ -316,10 +302,9 @@ bcdb_FindLatestDump(volSetName, dumpPath, deptr)
  *	tapeName: name of tape
  */
 
-bcdb_FindTape(dumpid, tapeName, teptr)
-     afs_int32 dumpid;
-     char *tapeName;
-     struct budb_tapeEntry *teptr;
+int
+bcdb_FindTape(afs_int32 dumpid, char *tapeName, 
+	      struct budb_tapeEntry *teptr)
 {
     budb_tapeList tl;
     afs_int32 next;
@@ -349,10 +334,9 @@ bcdb_FindTape(dumpid, tapeName, teptr)
     return (code);
 }
 
-bcdb_FindTapeSeq(dumpid, tapeSeq, teptr)
-     afs_int32 dumpid;
-     afs_int32 tapeSeq;
-     struct budb_tapeEntry *teptr;
+int
+bcdb_FindTapeSeq(afs_int32 dumpid, afs_int32 tapeSeq, 
+		 struct budb_tapeEntry *teptr)
 {
     budb_tapeList tl;
     afs_int32 next;
@@ -395,14 +379,10 @@ bcdb_FindTapeSeq(dumpid, tapeSeq, teptr)
  */
 
 afs_int32
-bcdb_FindVolumes(dumpID, volumeName, returnArray, last, next, maxa, nEntries)
-     afs_int32 dumpID;
-     char *volumeName;
-     struct budb_volumeEntry *returnArray;
-     afs_int32 last;
-     afs_int32 *next;
-     afs_int32 maxa;
-     afs_int32 *nEntries;
+bcdb_FindVolumes(afs_int32 dumpID, char *volumeName, 
+		 struct budb_volumeEntry *returnArray, 
+		 afs_int32 last, afs_int32 *next, afs_int32 maxa, 
+		 afs_int32 *nEntries)
 {
     budb_volumeList vl;
     afs_int32 dbTime;
@@ -423,17 +403,16 @@ bcdb_FindVolumes(dumpID, volumeName, returnArray, last, next, maxa, nEntries)
     return (code);
 }
 
-
-bcdb_FinishDump(deptr)
-     register struct budb_dumpEntry *deptr;
+int
+bcdb_FinishDump(register struct budb_dumpEntry *deptr)
 {
     afs_int32 code;
     code = ubik_BUDB_FinishDump(udbHandle.uh_client, 0, deptr);
     return (code);
 }
 
-bcdb_FinishTape(teptr)
-     register struct budb_tapeEntry *teptr;
+int
+bcdb_FinishTape(register struct budb_tapeEntry *teptr)
 {
     afs_int32 code;
     code = ubik_BUDB_FinishTape(udbHandle.uh_client, 0, teptr);
@@ -445,13 +424,9 @@ bcdb_FinishTape(teptr)
  */
 
 afs_int32
-bcdb_LookupVolume(volumeName, returnArray, last, next, maxa, nEntries)
-     char *volumeName;
-     struct budb_volumeEntry *returnArray;
-     afs_int32 last;
-     afs_int32 *next;
-     afs_int32 maxa;
-     afs_int32 *nEntries;
+bcdb_LookupVolume(char *volumeName, struct budb_volumeEntry *returnArray, 
+		  afs_int32 last, afs_int32 *next, afs_int32 maxa, 
+		  afs_int32 *nEntries)
 {
     budb_volumeList vl;
     afs_int32 dbTime;
@@ -475,10 +450,8 @@ bcdb_LookupVolume(volumeName, returnArray, last, next, maxa, nEntries)
     return (0);
 }
 
-
-bcdb_UseTape(teptr, newFlag)
-     register struct budb_tapeEntry *teptr;
-     afs_int32 *newFlag;
+int
+bcdb_UseTape(struct budb_tapeEntry *teptr, afs_int32 *newFlag)
 {
     afs_int32 code;
     code = ubik_BUDB_UseTape(udbHandle.uh_client, 0, teptr, newFlag);
@@ -500,6 +473,7 @@ bcdb_UseTape(teptr, newFlag)
  *	ctPtr - ptr to client structure with all the required information
  */
 
+int
 bcdb_GetTextFile(register udbClientTextP ctPtr)
 {
     afs_int32 bufferSize;
@@ -579,14 +553,13 @@ bcdb_GetTextFile(register udbClientTextP ctPtr)
  *	filename - where to get the text from
  */
 
-bcdb_SaveTextFile(ctPtr)
-     udbClientTextP ctPtr;
+int
+bcdb_SaveTextFile(udbClientTextP ctPtr)
 {
     afs_int32 bufferSize;
     afs_int32 offset, chunkSize, fileSize;
     charListT charList;
     afs_int32 code = 0;
-    afs_int32 filesize();
 
     /* allocate a buffer */
     bufferSize = 1024;
@@ -648,20 +621,16 @@ bcdb_SaveTextFile(ctPtr)
     return (code);
 }
 
-bcdb_FindLastTape(dumpID, dumpEntry, tapeEntry, volEntry)
-     afs_int32 dumpID;
-     struct budb_dumpEntry *dumpEntry;
-     struct budb_tapeEntry *tapeEntry;
-     struct budb_volumeEntry *volEntry;
+bcdb_FindLastTape(afs_int32 dumpID, struct budb_dumpEntry *dumpEntry,
+		  struct budb_tapeEntry *tapeEntry,
+		  struct budb_volumeEntry *volEntry)
 {
     return (ubik_BUDB_FindLastTape(udbHandle.uh_client, 0, dumpID, dumpEntry,
 	     tapeEntry, volEntry));
 }
 
-bcdb_MakeDumpAppended(appendedDumpID, initialDumpID, startTapeSeq)
-     afs_int32 appendedDumpID;
-     afs_int32 initialDumpID;
-     afs_int32 startTapeSeq;
+bcdb_MakeDumpAppended(afs_int32 appendedDumpID, afs_int32 initialDumpID,
+		      afs_int32 startTapeSeq)
 {
     return (ubik_BUDB_MakeDumpAppended(udbHandle.uh_client, 0, appendedDumpID,
 	     initialDumpID, startTapeSeq));
@@ -674,8 +643,7 @@ bcdb_MakeDumpAppended(appendedDumpID, initialDumpID, startTapeSeq)
  */
 
 afs_int32
-filesize(stream)
-     FILE *stream;
+filesize(FILE *stream)
 {
     afs_int32 offset;
     afs_int32 size;
@@ -703,8 +671,8 @@ filesize(stream)
  *	n - fail
  */
 
-bc_LockText(ctPtr)
-     register udbClientTextP ctPtr;
+int
+bc_LockText(udbClientTextP ctPtr)
 {
     afs_int32 code;
     afs_int32 timeout, j = 0;
@@ -752,8 +720,8 @@ bc_LockText(ctPtr)
  *	n - fail
  */
 
-bc_UnlockText(ctPtr)
-     register udbClientTextP ctPtr;
+int
+bc_UnlockText(udbClientTextP ctPtr)
 {
     afs_int32 code = 0;
 
@@ -774,8 +742,8 @@ bc_UnlockText(ctPtr)
  *	n - out of date or error
  */
 
-bc_CheckTextVersion(ctPtr)
-     register udbClientTextP ctPtr;
+int
+bc_CheckTextVersion(udbClientTextP ctPtr)
 {
     afs_int32 code;
     afs_uint32 tversion;
@@ -801,16 +769,14 @@ bc_CheckTextVersion(ctPtr)
 /* vldbClientInit 
  *      Initialize a client for the vl ubik database.
  */
-vldbClientInit(noAuthFlag, localauth, cellName, cstruct, ttoken)
-     int noAuthFlag;
-     int localauth;
-     char *cellName;
-     struct ubik_client **cstruct;
-     struct ktc_token *ttoken;
+int
+vldbClientInit(int noAuthFlag, int localauth, char *cellName, 
+	       struct ubik_client **cstruct, 
+	       struct ktc_token *ttoken)
 {
     afs_int32 code = 0;
     struct afsconf_dir *acdir;
-    struct rc_securityClass *sc;
+    struct rx_securityClass *sc;
     afs_int32 i, scIndex = 0;	/* Index of Rx security object - noauth */
     struct afsconf_cell info;
     struct ktc_principal sname;
@@ -950,10 +916,7 @@ vldbClientInit(noAuthFlag, localauth, cellName, cstruct, ttoken)
  */
 
 afs_int32
-udbClientInit(noAuthFlag, localauth, cellName)
-     int noAuthFlag;
-     int localauth;
-     char *cellName;
+udbClientInit(int noAuthFlag, int localauth, char *cellName)
 {
     struct ktc_principal principal;
     struct ktc_token token;
@@ -1147,13 +1110,11 @@ static struct ubikCallState uServer;
  */
 
 afs_int32
-ubik_Call_SingleServer(aproc, aclient, aflags, p1, p2, p3, p4, p5, p6, p7, p8,
-		       p9, p10, p11, p12, p13, p14, p15, p16)
-     register struct ubik_client *aclient;
-     int (*aproc) ();
-     afs_int32 aflags;
-     char *p1, *p2, *p3, *p4, *p5, *p6, *p7, *p8, *p9, *p10, *p11, *p12, *p13,
-	 *p14, *p15, *p16;
+ubik_Call_SingleServer(int (*aproc) (), struct ubik_client *aclient, 
+		       afs_int32 aflags, char *p1, char *p2, char *p3, 
+		       char *p4, char *p5, char *p6, char *p7, char *p8,
+		       char *p9, char *p10, char *p11, char *p12, char *p13, 
+		       char *p14, char *p15, char *p16)
 {
     register afs_int32 code;
     afs_int32 someCode, newHost, thisHost;
@@ -1294,7 +1255,8 @@ ubik_Call_SingleServer(aproc, aclient, aflags, p1, p2, p3, p4, p5, p6, p7, p8,
  *	n - error.
  */
 
-udbLocalInit()
+int
+udbLocalInit(void)
 {
     afs_int32 serverList[MAXSERVERS];
     char hostname[256];
diff --git a/src/bucoord/vol_sets.c b/src/bucoord/vol_sets.c
index 3333daf63..09880372b 100644
--- a/src/bucoord/vol_sets.c
+++ b/src/bucoord/vol_sets.c
@@ -29,19 +29,17 @@ RCSID
 #include <afs/bubasics.h>
 #include "bc.h"
 #include "error_macros.h"
-
+#include "bucoord_prototypes.h"
+    
 /* code to manage volumesets
  * specific to the ubik database implementation
  */
 
-afs_int32 bc_UpdateVolumeSet();
 extern struct bc_config *bc_globalConfig;
 extern struct udbHandleS udbHandle;
 extern char *whoami;
-extern struct bc_volumeSet *bc_FindVolumeSet(struct bc_config *cf, char *name);
-extern void FreeVolumeSet(struct bc_volumeSet *avset);
 
-static ListVolSet();
+static int ListVolSet(struct bc_volumeSet *aset);
 
 /* ------------------------------------
  * command level routines
@@ -373,7 +371,7 @@ bc_ListVolSetCmd(struct cmd_syndesc *as, void *arock)
     }
 
     /* figure out volume set to list */
-    if (ti = as->parms[0].items) {
+    if ((ti = as->parms[0].items)) {
 	/* for each volume set in the command item list */
 	for (; ti; ti = ti->next) {
 	    tset = bc_FindVolumeSet(bc_globalConfig, ti->data);
@@ -403,9 +401,9 @@ bc_ListVolSetCmd(struct cmd_syndesc *as, void *arock)
  * ------------------------------------
  */
 
-bc_ClearVolumeSets()
+int
+bc_ClearVolumeSets(void)
 {
-    struct udbHandleS *uhptr = &udbHandle;
     struct bc_volumeSet *vsPtr, *vsNextPtr, **vsPrev;
 
     extern struct bc_config *bc_globalConfig;
@@ -434,15 +432,14 @@ bc_ClearVolumeSets()
  */
 
 int
-bc_ParseVolumeSet()
+bc_ParseVolumeSet(void)
 {
-    static char rn[] = "bc_ParseVolumeSet";	/*Routine name */
     char tbuffer[1024];		/*Buffer for reading config file */
     char vsname[256];		/*Volume set name */
     char serverName[256];	/*Server name */
     char partName[256];		/*Partition name */
     register struct bc_volumeEntry *tve;	/*Ptr to generated volume spec struct */
-    register struct bc_volumeSet *tvs;	/*Ptr to volume set struct */
+    register struct bc_volumeSet *tvs = NULL;	/*Ptr to volume set struct */
     struct bc_volumeEntry **ppve, *pve;
     struct bc_volumeSet **ppvs, *pvs;
     register afs_int32 code;	/*Generalized return code */
@@ -596,7 +593,8 @@ bc_ParseVolumeSet()
  *	save the current volume set information to disk
  */
 
-bc_SaveVolumeSet()
+int
+bc_SaveVolumeSet(void)
 {
     register afs_int32 code = 0;
     register struct bc_volumeSet *tset;
@@ -657,7 +655,7 @@ bc_SaveVolumeSet()
 }
 
 afs_int32
-bc_UpdateVolumeSet()
+bc_UpdateVolumeSet(void)
 {
     struct udbHandleS *uhptr = &udbHandle;
     udbClientTextP ctPtr;
diff --git a/src/bucoord/volstub.c b/src/bucoord/volstub.c
index d143df15b..bf196cd10 100644
--- a/src/bucoord/volstub.c
+++ b/src/bucoord/volstub.c
@@ -36,11 +36,8 @@ extern char *whoami;
 /* ********************************************************************* */
 
 afs_int32
-bc_GetEntryByID(uclient, volID, volType, vldbEntryPtr)
-     struct ubik_client *uclient;
-     afs_int32 volID;
-     afs_int32 volType;
-     struct vldbentry *vldbEntryPtr;
+bc_GetEntryByID(struct ubik_client *uclient, afs_int32 volID, 
+		afs_int32 volType, struct vldbentry *vldbEntryPtr)
 {
     afs_int32 code = 0;
 
@@ -60,12 +57,8 @@ bc_GetEntryByID(uclient, volID, volType, vldbEntryPtr)
  */
 
 afs_int32
-volImageTime(serv, part, volid, voltype, clDatePtr)
-     afs_int32 serv;
-     afs_int32 part;
-     afs_int32 volid;
-     afs_int32 voltype;
-     afs_int32 *clDatePtr;
+volImageTime(afs_int32 serv, afs_int32 part, afs_int32 volid, 
+	     afs_int32 voltype, afs_int32 *clDatePtr)
 {
     afs_int32 code = 0;
     struct volintInfo *viptr;