From 54c074ba67d11ad78ef5113d6b7f43affd3cc4a5 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Sat, 1 Jul 2006 06:02:49 +0000 Subject: [PATCH] DEVEL15-butc-prototyping-20060701 have some prototypes happy july 1 and what a crappy day it is (cherry picked from commit 1947002d11358b9427adce1d6e03f5357a416ad8) --- src/butc/dbentries.c | 47 ++++++---------------------- src/butc/list.c | 28 +++-------------- src/butc/recoverDb.c | 73 ++++++++++++++------------------------------ src/butc/tcmain.c | 36 +++++++--------------- src/butc/tcprocs.c | 60 +++++++++--------------------------- 5 files changed, 63 insertions(+), 181 deletions(-) diff --git a/src/butc/dbentries.c b/src/butc/dbentries.c index 8398dae98..5da1ba1ef 100644 --- a/src/butc/dbentries.c +++ b/src/butc/dbentries.c @@ -46,9 +46,7 @@ dlqlinkT entries_to_flush; int dbWatcherinprogress; afs_int32 -threadEntryDir(anEntry, size, type) - char *anEntry; - afs_int32 size, type; +threadEntryDir(char *anEntry, afs_int32 size, afs_int32 type) { dlqlinkP entryPtr; char *entry = NULL; @@ -91,9 +89,7 @@ threadEntryDir(anEntry, size, type) */ afs_int32 -threadEntry(anEntry, size, type) - char *anEntry; - afs_int32 size, type; +threadEntry(char *anEntry, afs_int32 size, afs_int32 type) { dlqlinkP entryPtr; char *entry = NULL; @@ -132,8 +128,7 @@ threadEntry(anEntry, size, type) /* ------------------------------------------------------------------ */ afs_int32 -useDump(dumpEntryPtr) - struct budb_dumpEntry *dumpEntryPtr; +useDump(struct budb_dumpEntry *dumpEntryPtr) { afs_int32 code = 0; @@ -147,8 +142,7 @@ useDump(dumpEntryPtr) * Creates a dump entry (finished) and puts it onto the savedEntries list. */ afs_int32 -finishDump(aDumpEntryPtr) - struct budb_dumpEntry *aDumpEntryPtr; +finishDump(struct budb_dumpEntry *aDumpEntryPtr) { afs_int32 code = 0; @@ -163,16 +157,7 @@ finishDump(aDumpEntryPtr) * Creates a tape entry and puts it onto the savedEntries list. */ afs_int32 -useTape(aTapeEntryPtr, dumpID, tapename, tapeSeq, useCount, written, - expiration, tapepos) - struct budb_tapeEntry *aTapeEntryPtr; - afs_int32 dumpID; - char *tapename; - afs_int32 tapeSeq; - afs_int32 useCount; - Date written; - Date expiration; - afs_int32 tapepos; +useTape(struct budb_tapeEntry *aTapeEntryPtr, afs_int32 dumpID, char *tapename, afs_int32 tapeSeq, afs_int32 useCount, Date written, Date expiration, afs_int32 tapepos) { afs_int32 code = 0; @@ -197,9 +182,7 @@ useTape(aTapeEntryPtr, dumpID, tapename, tapeSeq, useCount, written, * Creates a tape entry (finished) and puts it onto the savedEntries list. */ afs_int32 -finishTape(aTapeEntryPtr, useKBytes) - struct budb_tapeEntry *aTapeEntryPtr; - afs_int32 useKBytes; +finishTape(struct budb_tapeEntry *aTapeEntryPtr, afs_int32 useKBytes) { afs_int32 code = 0; @@ -217,18 +200,7 @@ finishTape(aTapeEntryPtr, useKBytes) * Creates a volume entry and puts it onto the savedEntries list. */ afs_int32 -addVolume(aVolEntryPtr, dumpID, tapename, volname, volid, cloneDate, startPos, - volBytes, fragment, flags) - struct budb_volumeEntry *aVolEntryPtr; - afs_int32 dumpID; - char *tapename; - char *volname; - afs_int32 volid; - Date cloneDate; - afs_int32 startPos; - afs_int32 volBytes; - int fragment; - afs_int32 flags; +addVolume(struct budb_volumeEntry *aVolEntryPtr, afs_int32 dumpID, char *tapename, char *volname, afs_int32 volid, Date cloneDate, afs_int32 startPos, afs_int32 volBytes, int fragment, afs_int32 flags) { afs_int32 code = 0; int allo = 0; @@ -270,8 +242,7 @@ addVolume(aVolEntryPtr, dumpID, tapename, volname, volid, cloneDate, startPos, * and tapes and volumes should not be added to the DB. */ afs_int32 -flushSavedEntries(status) - afs_int32 status; +flushSavedEntries(afs_int32 status) { dlqlinkP entryPtr; struct budb_tapeEntry *tapePtr; @@ -318,6 +289,7 @@ flushSavedEntries(status) return (code); } +void waitDbWatcher() { int message = 0; @@ -342,6 +314,7 @@ waitDbWatcher() #define MAXVOLUMESTOADD 100 int addvolumes = 1; +void dbWatcher() { dlqlinkP entryPtr; diff --git a/src/butc/list.c b/src/butc/list.c index 04a622756..880a1b868 100644 --- a/src/butc/list.c +++ b/src/butc/list.c @@ -40,21 +40,9 @@ allocTaskId() } -#ifdef notdef -void static -DisplayNode(nodePtr) - struct dumpNode *nodePtr; -{ - TapeLog(99, nodePtr->dumpId, "Created dumpNode"); - return; - -} -#endif - /* initialize the node list used to keep track of the active dumps */ void -InitNodeList(portOffset) - afs_int32 portOffset; +InitNodeList(afs_int32 portOffset) { maxTaskID = (portOffset * 1000) + 1; /* this is the first task id alotted */ headNode.taskID = -1; @@ -74,8 +62,7 @@ InitNodeList(portOffset) */ void -CreateNode(newNode) - struct dumpNode **newNode; +CreateNode(struct dumpNode **newNode) { /* get space */ *newNode = (struct dumpNode *)(malloc(sizeof(struct dumpNode))); @@ -91,8 +78,7 @@ CreateNode(newNode) /* free the space allotted to the node with */ void -FreeNode(taskID) - afs_int32 taskID; +FreeNode(afs_int32 taskID) { struct dumpNode *oldPtr, *newPtr, *curPtr; int done; @@ -132,9 +118,7 @@ FreeNode(taskID) } afs_int32 -GetNthNode(aindex, aresult) - afs_int32 aindex; - afs_int32 *aresult; +GetNthNode(afs_int32 aindex, afs_int32 *aresult) { register struct dumpNode *tn; register int i; @@ -155,9 +139,7 @@ GetNthNode(aindex, aresult) /* return the node with into */ afs_int32 -GetNode(taskID, resultNode) - afs_int32 taskID; - struct dumpNode **resultNode; +GetNode(afs_int32 taskID, struct dumpNode **resultNode) { struct dumpNode *tmpPtr; int done; diff --git a/src/butc/recoverDb.c b/src/butc/recoverDb.c index 778ef281b..fe40c8ac5 100644 --- a/src/butc/recoverDb.c +++ b/src/butc/recoverDb.c @@ -54,9 +54,8 @@ extern struct deviceSyncNode *deviceLatch; /* PrintDumpLabel * print out the tape (dump) label. */ - -PrintDumpLabel(labelptr) - struct butm_tapeLabel *labelptr; +void +PrintDumpLabel(struct butm_tapeLabel *labelptr) { char tapeName[BU_MAXTAPELEN + 32]; time_t t; @@ -87,9 +86,8 @@ PrintDumpLabel(labelptr) /* PrintVolumeHeader * print the contents of a volume header. */ -static -PrintVolumeHeader(volHeader) - struct volumeHeader *volHeader; +static void +PrintVolumeHeader(struct volumeHeader *volHeader) { time_t t; @@ -115,8 +113,7 @@ PrintVolumeHeader(volHeader) */ afs_int32 -Ask(st) - char *st; +Ask(char *st) { int response; @@ -152,14 +149,8 @@ Ask(st) */ #define BIGCHUNK 102400 -static -scanVolData(taskId, curTapePtr, tapeVersion, volumeHeader, volumeTrailer, - bytesRead) - afs_int32 taskId; - struct butm_tapeInfo *curTapePtr; - afs_int32 tapeVersion; - struct volumeHeader *volumeHeader, *volumeTrailer; - afs_uint32 *bytesRead; +static int +scanVolData(afs_int32 taskId, struct butm_tapeInfo *curTapePtr, afs_int32 tapeVersion, struct volumeHeader *volumeHeader, struct volumeHeader *volumeTrailer, afs_uint32 *bytesRead) { afs_int32 headBytes, tailBytes; char *block = NULL; @@ -290,8 +281,7 @@ scanVolData(taskId, curTapePtr, tapeVersion, volumeHeader, volumeTrailer, */ char * -nextTapeLabel(prevTapeName) - char *prevTapeName; +nextTapeLabel(char *prevTapeName) { char *prevdot; char *retval; @@ -331,11 +321,8 @@ nextTapeLabel(prevTapeName) afs_int32 RcreateDump(); -static -readDump(taskId, tapeInfoPtr, scanInfoPtr) - afs_uint32 taskId; - struct butm_tapeInfo *tapeInfoPtr; - struct tapeScanInfo *scanInfoPtr; +static int +readDump(afs_uint32 taskId, struct butm_tapeInfo *tapeInfoPtr, struct tapeScanInfo *scanInfoPtr) { int moreTapes = 1; afs_int32 nbytes, flags, seq; @@ -577,10 +564,8 @@ readDump(taskId, tapeInfoPtr, scanInfoPtr) * try to read that dump too. * The first tape label is the first dumpLabel. */ -readDumps(taskId, tapeInfoPtr, scanInfoPtr) - afs_uint32 taskId; - struct butm_tapeInfo *tapeInfoPtr; - struct tapeScanInfo *scanInfoPtr; +int +readDumps(afs_uint32 taskId, struct butm_tapeInfo *tapeInfoPtr, struct tapeScanInfo *scanInfoPtr) { afs_int32 code, c; @@ -611,13 +596,7 @@ readDumps(taskId, tapeInfoPtr, scanInfoPtr) } afs_int32 -getScanTape(taskId, tapeInfoPtr, tname, tapeId, prompt, tapeLabelPtr) - afs_int32 taskId; - struct butm_tapeInfo *tapeInfoPtr; - char *tname; - afs_int32 tapeId; - int prompt; - struct butm_tapeLabel *tapeLabelPtr; +getScanTape(afs_int32 taskId, struct butm_tapeInfo *tapeInfoPtr, char *tname, afs_int32 tapeId, int prompt, struct butm_tapeLabel *tapeLabelPtr) { afs_int32 code = 0; int tapecount = 1; @@ -710,8 +689,8 @@ getScanTape(taskId, tapeInfoPtr, tname, tapeId, prompt, tapeLabelPtr) * */ -ScanDumps(ptr) - struct scanTapeIf *ptr; +int +ScanDumps(struct scanTapeIf *ptr) { struct butm_tapeInfo curTapeInfo; struct tapeScanInfo tapeScanInfo; @@ -778,9 +757,8 @@ ScanDumps(ptr) * 0 - not ok * 1 - ok */ -validatePath(labelptr, pathptr) - struct butm_tapeLabel *labelptr; - char *pathptr; +int +validatePath(struct butm_tapeLabel *labelptr, char *pathptr) { char *up, *tp; char tapeName[BU_MAXTAPELEN]; @@ -828,8 +806,7 @@ validatePath(labelptr, pathptr) */ char * -volumesetNamePtr(ptr) - char *ptr; +volumesetNamePtr(char *ptr) { static char vsname[BU_MAXUNAMELEN]; char *dotPtr; @@ -850,8 +827,7 @@ volumesetNamePtr(ptr) } char * -extractDumpName(ptr) - char *ptr; +extractDumpName(char *ptr) { static char dname[BU_MAXTAPELEN]; char *dotPtr; @@ -882,8 +858,8 @@ extractDumpName(ptr) * -1 - error, couldn't extract sequence number */ -extractTapeSeq(tapename) - char *tapename; +int +extractTapeSeq(char *tapename) { char *sptr; @@ -899,8 +875,7 @@ extractTapeSeq(tapename) * a database tape or not. */ int -databaseTape(tapeName) - char *tapeName; +databaseTape(char *tapeName) { char *sptr; int c; @@ -917,9 +892,7 @@ databaseTape(tapeName) } afs_int32 -RcreateDump(tapeScanInfoPtr, volHeaderPtr) - struct tapeScanInfo *tapeScanInfoPtr; - struct volumeHeader *volHeaderPtr; +RcreateDump(struct tapeScanInfo *tapeScanInfoPtr, struct volumeHeader *volHeaderPtr) { afs_int32 code; struct butm_tapeLabel *dumpLabelPtr = &tapeScanInfoPtr->dumpLabel; diff --git a/src/butc/tcmain.c b/src/butc/tcmain.c index 7d9a23158..7a6cdea0d 100644 --- a/src/butc/tcmain.c +++ b/src/butc/tcmain.c @@ -119,8 +119,7 @@ osi_audit() } static afs_int32 -SafeATOL(anum) - register char *anum; +SafeATOL(register char *anum) { register afs_int32 total; register int tc; @@ -155,10 +154,8 @@ SafeATOL(anum) * should deal with signed numbers. Should signal error if no digits * seen. */ -atocl(numstring, crunit, number) - char *numstring; - char crunit; /* Units to report number in */ - afs_int32 *number; +int +atocl(char *numstring, char crunit, afs_int32 *number) { float total; afs_int32 runits; @@ -255,8 +252,7 @@ atocl(numstring, crunit, number) /* replace last two ocurrences of / by _ */ static -stringReplace(name) - char *name; +stringReplace(char *name) { char *pos; char buffer[256]; @@ -271,9 +267,7 @@ stringReplace(name) } static -stringNowReplace(logFile, deviceName) - char *logFile, *deviceName; - +stringNowReplace(char *logFile, char *deviceName) { char *pos = 0; char storeDevice[256]; @@ -323,10 +317,7 @@ stringNowReplace(logFile, deviceName) #define LINESIZE 256 static afs_int32 -GetDeviceConfig(filename, config, portOffset) - char *filename; - struct tapeConfig *config; - afs_int32 portOffset; +GetDeviceConfig(char *filename, struct tapeConfig *config, afs_int32 portOffset) { FILE *devFile = 0; char line[LINESIZE]; @@ -415,9 +406,7 @@ GetDeviceConfig(filename, config, portOffset) /* GetConfigParams */ static afs_int32 -GetConfigParams(filename, port) - char *filename; - afs_int32 port; +GetConfigParams(char *filename, afs_int32 port) { char paramFile[256]; FILE *devFile = 0; @@ -840,10 +829,8 @@ GetConfigParams(filename, port) return (code); } -static -WorkerBee(as, arock) - struct cmd_syndesc *as; - char *arock; +static int +WorkerBee(struct cmd_syndesc *as, char *arock) { register afs_int32 code; struct rx_securityClass *(securityObjects[3]); @@ -1169,9 +1156,8 @@ WorkerBee(as, arock) #include "AFS_component_version_number.c" #endif -main(argc, argv) - int argc; - char **argv; +int +main(int argc, char **argv) { register struct cmd_syndesc *ts; register struct cmd_item *ti; diff --git a/src/butc/tcprocs.c b/src/butc/tcprocs.c index fbe66a600..d005e6add 100644 --- a/src/butc/tcprocs.c +++ b/src/butc/tcprocs.c @@ -42,8 +42,8 @@ RCSID #include "error_macros.h" #include "butc_xbsa.h" -callPermitted(call) - struct rx_call *call; +int +callPermitted(struct rx_call *call) { /* before this code can be used, the rx connection, on the bucoord side, must */ /* be changed so that it will set up for token passing instead of using a */ @@ -57,9 +57,7 @@ callPermitted(call) */ static int -CopyDumpDesc(toDump, fromDump) - struct tc_dumpDesc *toDump; - tc_dumpArray *fromDump; +CopyDumpDesc(struct tc_dumpDesc *toDump, tc_dumpArray *fromDump) { struct tc_dumpDesc *toPtr, *fromPtr; int i; @@ -82,9 +80,7 @@ CopyDumpDesc(toDump, fromDump) static int -CopyRestoreDesc(toRestore, fromRestore) - struct tc_restoreDesc *toRestore; - tc_restoreArray *fromRestore; +CopyRestoreDesc(struct tc_restoreDesc *toRestore, tc_restoreArray *fromRestore) { struct tc_restoreDesc *toPtr, *fromPtr; int i; @@ -112,8 +108,7 @@ CopyRestoreDesc(toRestore, fromRestore) } static int -CopyTapeSetDesc(toPtr, fromPtr) - struct tc_tapeSet *toPtr, *fromPtr; +CopyTapeSetDesc(struct tc_tapeSet *toPtr, struct tc_tapeSet *fromPtr) { toPtr->id = fromPtr->id; @@ -134,10 +129,7 @@ CopyTapeSetDesc(toPtr, fromPtr) */ afs_int32 -STC_LabelTape(acid, label, taskId) - struct rx_call *acid; - struct tc_tapeLabel *label; - afs_uint32 *taskId; +STC_LabelTape(struct rx_call *acid, struct tc_tapeLabel *label, afs_uint32 *taskId) { #ifdef AFS_PTHREAD_ENV pthread_t pid; @@ -217,11 +209,7 @@ STC_LabelTape(acid, label, taskId) */ afs_int32 -STC_PerformDump(rxCallId, tcdiPtr, tc_dumpArrayPtr, taskId) - struct rx_call *rxCallId; - struct tc_dumpInterface *tcdiPtr; - tc_dumpArray *tc_dumpArrayPtr; - afs_int32 *taskId; +STC_PerformDump(struct rx_call *rxCallId, struct tc_dumpInterface *tcdiPtr, tc_dumpArray *tc_dumpArrayPtr, afs_int32 *taskId) { struct dumpNode *newNode = 0; statusP statusPtr = 0; @@ -320,11 +308,7 @@ STC_PerformDump(rxCallId, tcdiPtr, tc_dumpArrayPtr, taskId) } afs_int32 -STC_PerformRestore(acid, dumpSetName, arestores, taskID) - struct rx_call *acid; - char *dumpSetName; /* not used */ - tc_restoreArray *arestores; - afs_int32 *taskID; +STC_PerformRestore(struct rx_call *acid, char *dumpSetName, tc_restoreArray *arestores, afs_int32 *taskID) { struct dumpNode *newNode; statusP statusPtr; @@ -401,10 +385,7 @@ STC_PerformRestore(acid, dumpSetName, arestores, taskID) } afs_int32 -STC_ReadLabel(acid, label, taskId) - struct rx_call *acid; - struct tc_tapeLabel *label; - afs_uint32 *taskId; +STC_ReadLabel(struct rx_call *acid, struct tc_tapeLabel *label, afs_uint32 *taskId) { afs_int32 code; @@ -427,9 +408,7 @@ STC_ReadLabel(acid, label, taskId) */ afs_int32 -STC_RestoreDb(rxCall, taskId) - struct rx_call *rxCall; - afs_uint32 *taskId; +STC_RestoreDb(struct rx_call *rxCall, afs_uint32 *taskId) { #ifdef AFS_PTHREAD_ENV pthread_t pid; @@ -499,10 +478,7 @@ STC_RestoreDb(rxCall, taskId) */ afs_int32 -STC_SaveDb(rxCall, archiveTime, taskId) - struct rx_call *rxCall; - Date archiveTime; - afs_uint32 *taskId; +STC_SaveDb(struct rx_call *rxCall, Date archiveTime, afs_uint32 *taskId) { #ifdef AFS_PTHREAD_ENV pthread_t pid; @@ -585,10 +561,7 @@ STC_SaveDb(rxCall, archiveTime, taskId) */ afs_int32 -STC_ScanDumps(acid, addDbFlag, taskId) - struct rx_call *acid; - afs_int32 addDbFlag; - afs_uint32 *taskId; +STC_ScanDumps(struct rx_call *acid, afs_int32 addDbFlag, afs_uint32 *taskId) { #ifdef AFS_PTHREAD_ENV pthread_t pid; @@ -667,9 +640,7 @@ STC_ScanDumps(acid, addDbFlag, taskId) */ afs_int32 -STC_TCInfo(acid, tciptr) - struct rx_call *acid; - struct tc_tcInfo *tciptr; +STC_TCInfo(struct rx_call *acid, struct tc_tcInfo *tciptr) { if (callPermitted(acid) == 0) return (TC_NOTPERMITTED); @@ -681,10 +652,7 @@ STC_TCInfo(acid, tciptr) /* STC_DeleteDump */ afs_int32 -STC_DeleteDump(acid, dumpID, taskId) - struct rx_call *acid; - afs_uint32 dumpID; - afs_uint32 *taskId; +STC_DeleteDump(struct rx_call *acid, afs_uint32 dumpID, afs_uint32 *taskId) { struct deleteDumpIf *ptr = 0; statusP statusPtr = 0; -- 2.39.5