From 6bb7bad9fc258c482d2f5786f2b03e90ccb54ad2 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Tue, 21 Jul 2009 20:53:57 +0100 Subject: [PATCH] Further code cleanup for the backup suite Protect butm.h against multiple inclusion Prototype more functions for internal use in bucoord Remove some unused variables Include additional headers as required Prototype exported functions in budb Make SendReturnList helper function generic, by using a void * rock Reviewed-on: http://gerrit.openafs.org/http://gerrit.openafs.org/168 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/bubasics/butm.p.h | 5 +++++ src/bucoord/bucoord_internal.h | 8 ++++++++ src/bucoord/commands.c | 3 ++- src/bucoord/dump.c | 4 ++-- src/bucoord/dump_sched.c | 1 + src/bucoord/main.c | 3 ++- src/bucoord/tape_hosts.c | 1 + src/bucoord/vol_sets.c | 1 + src/budb/budb_prototypes.h | 3 +++ src/budb/db_hash.c | 2 +- src/budb/procs.c | 11 +++++++---- src/butc/lwps.c | 2 +- src/butm/file_tm.c | 8 ++++---- 13 files changed, 38 insertions(+), 14 deletions(-) diff --git a/src/bubasics/butm.p.h b/src/bubasics/butm.p.h index 6827dbea5..b84287b00 100644 --- a/src/bubasics/butm.p.h +++ b/src/bubasics/butm.p.h @@ -7,6 +7,9 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#ifndef AFS_SRC_BUBASICS_BUTM_H +#define AFS_SRC_BUBASICS_BUTM_H + #include #include @@ -149,3 +152,5 @@ struct butm_tapeLabel { #define butm_WriteEOT(i) (*((i)->ops.writeEOT))(i) #define butm_SetSize(i,s) (*((i)->ops.setSize))(i,s) #define butm_GetSize(i,s) (*((i)->ops.getSize))(i,s) + +#endif diff --git a/src/bucoord/bucoord_internal.h b/src/bucoord/bucoord_internal.h index 8fc8f1652..88a28cd58 100644 --- a/src/bucoord/bucoord_internal.h +++ b/src/bucoord/bucoord_internal.h @@ -57,6 +57,7 @@ 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); +extern int bc_InitConfig(char *apath); /* dsstub.c */ extern char *tailCompPtr(char *pathNamePtr); @@ -164,6 +165,13 @@ extern afs_int32 bcdb_LookupVolume(char *volumeName, extern int bcdb_FindTape(afs_int32 dumpid, char *tapeName, struct budb_tapeEntry *teptr); +extern afs_int32 udbClientInit(int noAuthFlag, int localauth, char *cellName); + +struct ktc_token; +extern int vldbClientInit(int noAuthFlag, int localauth, char *cellName, + struct ubik_client **cstruct, + struct ktc_token *ttoken); + /* vol_sets.c */ extern afs_int32 bc_UpdateVolumeSet(void); extern int bc_SaveVolumeSet(void); diff --git a/src/bucoord/commands.c b/src/bucoord/commands.c index c97a350b4..d7f2d99d2 100644 --- a/src/bucoord/commands.c +++ b/src/bucoord/commands.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include /* PA */ #include @@ -2426,7 +2427,7 @@ bc_deleteDumpCmd(struct cmd_syndesc *as, void *arock) char *timeString; budb_dumpsList dumps, flags; int i; - afs_int32 port = -1, dbonly = 0, force; + afs_int32 port = -1, force; /* Must specify at least one of -dumpid, -from, or -to */ if (!as->parms[0].items && !as->parms[1].items && !as->parms[2].items diff --git a/src/bucoord/dump.c b/src/bucoord/dump.c index b8d3a06d0..4a373f154 100644 --- a/src/bucoord/dump.c +++ b/src/bucoord/dump.c @@ -246,7 +246,7 @@ bc_StartDmpRst(struct bc_config *aconfig, char *adname, char *avname, { register int i; register afs_int32 code; - void *junk; + void *junk = NULL; for (i = 0; i < BC_MAXSIMDUMPS; i++) if (!(bc_dumpTasks[i].flags & BC_DI_INUSE)) @@ -289,7 +289,7 @@ bc_StartDmpRst(struct bc_config *aconfig, char *adname, char *avname, code = LWP_CreateProcess(bc_DmpRstStart, 20480, LWP_NORMAL_PRIORITY, - (void *)i, "helper", &junk); + (void *)i, "helper", junk); if (code) { bc_HandleMisc(code); afs_com_err(whoami, code, "; Can't start thread"); diff --git a/src/bucoord/dump_sched.c b/src/bucoord/dump_sched.c index 06669be66..a2a49ab6f 100644 --- a/src/bucoord/dump_sched.c +++ b/src/bucoord/dump_sched.c @@ -34,6 +34,7 @@ #include "bc.h" #include "error_macros.h" #include "bucoord_internal.h" +#include "bucoord_prototypes.h" /* code to manage dump schedules * specific to the ubik database implementation diff --git a/src/bucoord/main.c b/src/bucoord/main.c index 90e228a68..508d4634a 100644 --- a/src/bucoord/main.c +++ b/src/bucoord/main.c @@ -48,6 +48,7 @@ #include #include #include +#include #include "bc.h" /*Backup Coordinator structs and defs */ #include "bucoord_internal.h" @@ -226,7 +227,7 @@ backupInit(void) } initd = 1; - code = bc_InitConfig(DefaultConfDir); + code = bc_InitConfig((char *)DefaultConfDir); if (code) { afs_com_err(whoami, code, "Can't initialize from config files in directory '%s'", diff --git a/src/bucoord/tape_hosts.c b/src/bucoord/tape_hosts.c index a5d98f818..f6315d410 100644 --- a/src/bucoord/tape_hosts.c +++ b/src/bucoord/tape_hosts.c @@ -28,6 +28,7 @@ #include "error_macros.h" #include #include "bucoord_internal.h" +#include "bucoord_prototypes.h" /* code to manage tape hosts * specific to the ubik database implementation diff --git a/src/bucoord/vol_sets.c b/src/bucoord/vol_sets.c index 70e2cb5f4..2820c62f8 100644 --- a/src/bucoord/vol_sets.c +++ b/src/bucoord/vol_sets.c @@ -28,6 +28,7 @@ #include "bc.h" #include "error_macros.h" #include "bucoord_internal.h" +#include "bucoord_prototypes.h" /* code to manage volumesets * specific to the ubik database implementation diff --git a/src/budb/budb_prototypes.h b/src/budb/budb_prototypes.h index 0667e7a1c..5c995871b 100644 --- a/src/budb/budb_prototypes.h +++ b/src/budb/budb_prototypes.h @@ -20,4 +20,7 @@ extern void tapeEntry_ntoh(struct budb_tapeEntry *, struct budb_tapeEntry *); extern void volumeEntry_ntoh(struct budb_volumeEntry *, struct budb_volumeEntry *); extern int default_tapeset(struct budb_tapeSet *, char *); +extern void printDumpEntry(struct budb_dumpEntry *deptr); +extern void printTapeEntry(struct budb_tapeEntry *teptr); +extern void printVolumeEntry(struct budb_volumeEntry *veptr); #endif diff --git a/src/budb/db_hash.c b/src/budb/db_hash.c index 102bbd899..9a3b62a3b 100644 --- a/src/budb/db_hash.c +++ b/src/budb/db_hash.c @@ -254,7 +254,7 @@ ht_GetTableBlock(struct ubik_trans *ut, struct memoryHashTable *mht, int n; int i; int length; - dbadr ta = NULL; + dbadr ta = 0; if ((mht == 0) || ((ht = mht->ht) == 0) diff --git a/src/budb/procs.c b/src/budb/procs.c index f8d37cc2c..34eb55cd0 100644 --- a/src/budb/procs.c +++ b/src/budb/procs.c @@ -395,8 +395,9 @@ AddToReturnList(struct returnList *list, dbadr a, afs_int32 *to_skipP) } afs_int32 -FillVolEntry(struct ubik_trans *ut, dbadr va, struct budb_volumeEntry *vol) +FillVolEntry(struct ubik_trans *ut, dbadr va, void *rock) { + struct budb_volumeEntry *vol = (struct budb_volumeEntry *) rock; struct dump d; struct tape t; struct volInfo vi; @@ -431,8 +432,9 @@ FillVolEntry(struct ubik_trans *ut, dbadr va, struct budb_volumeEntry *vol) } afs_int32 -FillDumpEntry(struct ubik_trans *ut, dbadr da, struct budb_dumpEntry *dump) +FillDumpEntry(struct ubik_trans *ut, dbadr da, void *rock) { + struct budb_dumpEntry *dump = (struct budb_dumpEntry *)rock; struct dump d, ad; if (dbread(ut, da, &d, sizeof(d))) @@ -473,8 +475,9 @@ FillDumpEntry(struct ubik_trans *ut, dbadr da, struct budb_dumpEntry *dump) } afs_int32 -FillTapeEntry(struct ubik_trans *ut, dbadr ta, struct budb_tapeEntry *tape) +FillTapeEntry(struct ubik_trans *ut, dbadr ta, void *rock) { + struct budb_tapeEntry *tape=(struct budb_tapeEntry *) rock; struct tape t; struct dump d; afs_int32 code; @@ -517,7 +520,7 @@ static afs_int32 SendReturnList(struct ubik_trans *ut, struct returnList *list, /* list of elements to return */ afs_int32(*FillProc) (struct ubik_trans *, dbadr da, - budb_dumpEntry *), + void *), /* proc to fill entry */ int e_size, /* size of each element */ afs_int32 index, /* index from previous call */ diff --git a/src/butc/lwps.c b/src/butc/lwps.c index 3127a3abf..c4fded6cb 100644 --- a/src/butc/lwps.c +++ b/src/butc/lwps.c @@ -46,7 +46,7 @@ extern int tapemounted; extern char *opencallout; extern char *closecallout; extern char *whoami; -extern char *extractDumpName(); +extern char *extractDumpName(char *); extern int BufferSize; /* Size in B stored for header info */ FILE *restoretofilefd; #ifdef xbsa diff --git a/src/butm/file_tm.c b/src/butm/file_tm.c index 948fd960d..c1d0c2db6 100644 --- a/src/butm/file_tm.c +++ b/src/butm/file_tm.c @@ -672,11 +672,11 @@ incPosition(struct butm_tapeInfo *info, usd_handle_t fid, afs_uint32 dataSize) */ afs_int32 TapeBlockSize; afs_int32 -readData(usd_handle_t fid, char *data, afs_int32 totalSize, afs_int32 *errorP) +readData(usd_handle_t fid, char *data, afs_uint32 totalSize, afs_int32 *errorP) { afs_int32 toread; /* Number of bytes to read */ - afs_int32 rSize; /* Total bytes read so far */ - afs_int32 tSize; /* Temporary size */ + afs_uint32 rSize; /* Total bytes read so far */ + afs_uint32 tSize; /* Temporary size */ afs_int32 rc; /* return code */ toread = totalSize; /* First, try to read all the data */ @@ -775,7 +775,7 @@ WriteTapeBlock(struct butm_tapeInfo *info, afs_int32 blockType) { afs_int32 code = 0, rc = 0; - afs_int32 wsize; + afs_uint32 wsize; struct tapeLabel *label; struct fileMark *fmark; struct blockMark *bmark; -- 2.39.5