jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-31 13:38:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

volser: cleanup volser_internal.h

Browse Source 
remove yesprompt() prototype for function that no longer exists

make dump_sig_handler(), sortVolumes(), VolumeExists(),
CheckVldbRWBK(), CheckVldbRO(), and CheckVldb() static within
vsprocs.c

Change-Id: I2130ac0d2f0dbfe6bf3315450ba342b6e9d51b6b
Reviewed-on: http://gerrit.openafs.org/4136
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
This commit is contained in:
Jeffrey Altman 2011-03-05 09:38:08 -05:00 committed by Jeffrey Altman
parent 5b614c6cb0
commit 06c3c3712c
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/volser/volser_internal.h
View File

@ -33,7 +33,6 @@ extern afs_int32 GCTrans(void);
/* vsprocs.c */
struct nvldbentry;
extern int yesprompt(char *str);
extern int PrintError(char *msg, afs_int32 errcode);
extern void init_volintInfo(struct volintInfo *vinfo);
extern void SubEnumerateEntry(struct nvldbentry *entry);
@ -62,7 +61,6 @@ extern int UV_BackupVolume(afs_uint32 aserver, afs_int32 apart,
afs_uint32 avolid);
extern int UV_ReleaseVolume(afs_uint32 afromvol, afs_uint32 afromserver,
afs_int32 afrompart, int forceflag);
extern void dump_sig_handler(int x);
extern int UV_DumpVolume(afs_uint32 afromvol, afs_uint32 afromserver,
afs_int32 afrompart, afs_int32 fromdate,
afs_int32(*DumpFunction) (struct rx_call *, void *),
@ -96,18 +94,10 @@ extern int UV_XListVolumes(afs_uint32 a_serverID, afs_int32 a_partID,
extern int UV_XListOneVolume(afs_uint32 a_serverID, afs_int32 a_partID,
afs_uint32 a_volID,
struct volintXInfo **a_resultPP);
extern int sortVolumes(const void *a, const void *b);
extern int UV_SyncVolume(afs_uint32 aserver, afs_int32 apart, char *avolname,
int flags);
extern int UV_SyncVldb(afs_uint32 aserver, afs_int32 apart, int flags,
int force);
extern afs_int32 VolumeExists(afs_uint32 server, afs_int32 partition,
afs_uint32 volumeid);
extern afs_int32 CheckVldbRWBK(struct nvldbentry *entry,
afs_int32 * modified);
extern int CheckVldbRO(struct nvldbentry *entry, afs_int32 * modified);
extern afs_int32 CheckVldb(struct nvldbentry *entry, afs_int32 * modified,
afs_int32 *deleted);
extern int UV_SyncServer(afs_uint32 aserver, afs_int32 apart, int flags,
int force);
extern int UV_RenameVolume(struct nvldbentry *entry, char oldname[],

21
src/volser/vsprocs.c
View File

@ -188,6 +188,15 @@ static int SimulateForwardMultiple(struct rx_connection *fromconn,
static afs_int32 CheckVolume(volintInfo * volumeinfo, afs_uint32 aserver,
afs_int32 apart, afs_int32 * modentry,
afs_uint32 * maxvolid, struct nvldbentry *aentry);
static afs_int32 VolumeExists(afs_uint32 server, afs_int32 partition,
afs_uint32 volumeid);
static afs_int32 CheckVldbRWBK(struct nvldbentry * entry,
afs_int32 * modified);
static afs_int32 CheckVldbRO(struct nvldbentry *entry, afs_int32 * modified);
static afs_int32 CheckVldb(struct nvldbentry *entry, afs_int32 * modified,
afs_int32 *deleted);
static void dump_sig_handler(int x);
static int sortVolumes(const void *a, const void *b);
/*map the partition <partId> into partition name <partName>*/
@ -4178,7 +4187,7 @@ UV_ReleaseVolume(afs_uint32 afromvol, afs_uint32 afromserver,
}
void
static void
dump_sig_handler(int x)
{
fprintf(STDERR, "\nSignal handler: vos dump operation\n");
@ -6115,7 +6124,7 @@ CheckVolume(volintInfo * volumeinfo, afs_uint32 aserver, afs_int32 apart,
return (error);
}
int
static int
sortVolumes(const void *a, const void *b)
{
volintInfo *v1 = (volintInfo *) a;
@ -6530,7 +6539,7 @@ UV_SyncVldb(afs_uint32 aserver, afs_int32 apart, int flags, int force)
* Some error codes mean the volume is unavailable but
* still exists - so we catch these error codes.
*/
afs_int32
static afs_int32
VolumeExists(afs_uint32 server, afs_int32 partition, afs_uint32 volumeid)
{
struct rx_connection *conn = (struct rx_connection *)0;
@ -6554,7 +6563,7 @@ VolumeExists(afs_uint32 server, afs_int32 partition, afs_uint32 volumeid)
/* CheckVldbRWBK()
*
*/
afs_int32
static afs_int32
CheckVldbRWBK(struct nvldbentry * entry, afs_int32 * modified)
{
int modentry = 0;
@ -6661,7 +6670,7 @@ CheckVldbRWBK(struct nvldbentry * entry, afs_int32 * modified)
return (error);
}
int
static afs_int32
CheckVldbRO(struct nvldbentry *entry, afs_int32 * modified)
{
int idx;
@ -6725,7 +6734,7 @@ CheckVldbRO(struct nvldbentry *entry, afs_int32 * modified)
/* CheckVldb()
* Ensure that <entry> matches with the info on file servers
*/
afs_int32
static afs_int32
CheckVldb(struct nvldbentry * entry, afs_int32 * modified, afs_int32 * deleted)
{
afs_int32 code, error = 0;