From 598301361c7ff1f1767a7b2bae4ce63190ee017c Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Wed, 31 Oct 2007 04:13:07 +0000 Subject: [PATCH] STABLE14-openafs-void-star-pointers-20071031 convert anonymous pointers from char* to void* (cherry picked from commit 855e6442615ad2c42ca8f485d8a7efbcdb8f2105) --- src/WINNT/afs_setup_utils/afsrm.c | 4 +- src/WINNT/afsd/cklog.c | 9 +- src/WINNT/afsd/cunlog.c | 7 +- src/WINNT/afsd/fs.c | 192 +++++++++++----------- src/WINNT/afsd/sample/token.c | 9 +- src/WINNT/afsd/symlink.c | 18 +-- src/WINNT/afsreg/test/regman.c | 32 ++-- src/afsd/afsd.c | 2 +- src/afsmonitor/afsmonitor.c | 5 +- src/afsweb/weblog.c | 8 +- src/bozo/bos.c | 228 +++++++++++---------------- src/bu_utils/fms.c | 12 +- src/bucoord/commands.c | 93 ++++------- src/bucoord/dump_sched.c | 30 ++-- src/bucoord/main.c | 67 ++++---- src/bucoord/tape_hosts.c | 18 +-- src/bucoord/vol_sets.c | 37 ++--- src/budb/server.c | 11 +- src/butc/read_tape.c | 5 +- src/butc/tcmain.c | 2 +- src/butc/test.c | 55 ++++--- src/cmd/cmd.c | 28 ++-- src/cmd/cmd.p.h | 16 +- src/cmd/test/ctest.c | 17 +- src/cmd/test/dtest.c | 11 +- src/cmd/test/itest.c | 23 +-- src/gtx/object_test.c | 7 +- src/gtx/screen_test.c | 7 +- src/kauth/admin_tools.c | 79 +++++----- src/kauth/kdb.c | 7 +- src/kauth/klog.c | 6 +- src/kauth/knfs.c | 11 +- src/kauth/kpasswd.c | 6 +- src/kauth/manyklog.c | 9 +- src/kauth/rebuild.c | 5 +- src/kauth/test/multiklog.c | 9 +- src/kauth/test/test_getticket.c | 10 +- src/kauth/test/test_rxkad_free.c | 10 +- src/libadmin/cfg/test/cfgtest.c | 56 +++---- src/libadmin/test/afscp.c | 4 +- src/libadmin/test/bos.c | 144 ++++++++--------- src/libadmin/test/client.c | 56 +++---- src/libadmin/test/kas.c | 44 +++--- src/libadmin/test/pts.c | 80 +++++----- src/libadmin/test/util.c | 12 +- src/libadmin/test/util.h | 6 +- src/libadmin/test/vos.c | 132 ++++++++-------- src/log/unlog.c | 4 +- src/ptserver/db_verify.c | 2 +- src/ptserver/pt_util.c | 6 +- src/ptserver/pts.c | 36 ++--- src/ptserver/testpt.c | 16 +- src/rx/test/generator.c | 8 +- src/rxdebug/rxdebug.c | 6 +- src/rxkad/test/stress.c | 6 +- src/scout/scout.c | 7 +- src/ubik/udebug.c | 4 +- src/uss/uss.c | 41 ++--- src/venus/cacheout.c | 21 ++- src/venus/cmdebug.c | 4 +- src/venus/fs.c | 175 ++++++++++---------- src/venus/fstrace.c | 48 +++--- src/venus/kdump.c | 11 +- src/venus/test/getinitparams.c | 2 +- src/venus/twiddle.c | 10 +- src/venus/whatfid.c | 5 +- src/vlserver/cnvldb.c | 8 +- src/vlserver/sascnvldb.c | 7 +- src/vlserver/vlclient.c | 7 +- src/vlserver/vldb_check.c | 2 +- src/vol/vol-bless.c | 4 +- src/vol/vol-info.c | 4 +- src/volser/restorevol.c | 5 +- src/volser/vol-dump.c | 4 +- src/volser/vos.c | 254 ++++++++++++------------------ src/xstat/xstat_cm_test.c | 6 +- 76 files changed, 1061 insertions(+), 1291 deletions(-) diff --git a/src/WINNT/afs_setup_utils/afsrm.c b/src/WINNT/afs_setup_utils/afsrm.c index 1761a76fa..e20dedf9b 100644 --- a/src/WINNT/afs_setup_utils/afsrm.c +++ b/src/WINNT/afs_setup_utils/afsrm.c @@ -23,7 +23,7 @@ #include "forceremove.h" -static int DoClient34(struct cmd_syndesc *as, char *arock) +static int DoClient34(struct cmd_syndesc *as, void *arock) { DWORD status = Client34Eradicate(FALSE); @@ -40,7 +40,7 @@ SetupCmd(void) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax("client34", DoClient34, 0, + ts = cmd_CreateSyntax("client34", DoClient34, NULL, "remove AFS 3.4a client"); } diff --git a/src/WINNT/afsd/cklog.c b/src/WINNT/afsd/cklog.c index a5851ffd9..49669aaed 100644 --- a/src/WINNT/afsd/cklog.c +++ b/src/WINNT/afsd/cklog.c @@ -22,7 +22,7 @@ #define BAD_ARGUMENT 1 #define KLOGEXIT(code) exit(code) -int CommandProc(); +static int CommandProc(struct cmd_syndesc *, void *); static int zero_argc; static char **zero_argv; @@ -40,7 +40,7 @@ void main (argc, argv) /* Start up sockets */ WSAStartup(0x0101, &WSAjunk); - ts = cmd_CreateSyntax((char *) 0, CommandProc, 0, "obtain Kerberos authentication"); + ts = cmd_CreateSyntax(NULL, CommandProc, NULL, "obtain Kerberos authentication"); #define aXFLAG 0 #define aPRINCIPAL 1 @@ -135,9 +135,8 @@ static int read_pw_string(char *s, int max) return !ok; } -CommandProc (as, arock) - char *arock; - struct cmd_syndesc *as; +static int +CommandProc (struct cmd_syndesc *as, void *arock) { char name[MAXKTCNAMELEN]; char instance[MAXKTCNAMELEN]; diff --git a/src/WINNT/afsd/cunlog.c b/src/WINNT/afsd/cunlog.c index fb4018443..49a82f861 100644 --- a/src/WINNT/afsd/cunlog.c +++ b/src/WINNT/afsd/cunlog.c @@ -15,9 +15,8 @@ #include #include -CommandProc (as, arock) - char *arock; - struct cmd_syndesc *as; +static int +CommandProc (struct cmd_syndesc *as, void *arock) { afs_int32 code, ecode=0; struct ktc_principal server; @@ -55,7 +54,7 @@ main(argc, argv) WSAStartup(0x0101, &WSAjunk); - ts = cmd_CreateSyntax((char *) 0, CommandProc, 0, "Release Kerberos authentication"); + ts = cmd_CreateSyntax(NULL, CommandProc, NULL, "Release Kerberos authentication"); cmd_AddParm(ts, "-cell", CMD_LIST, CMD_OPTIONAL, "cell name"); code = cmd_Dispatch(argc, argv); diff --git a/src/WINNT/afsd/fs.c b/src/WINNT/afsd/fs.c index 051c34f51..9b48068aa 100644 --- a/src/WINNT/afsd/fs.c +++ b/src/WINNT/afsd/fs.c @@ -50,17 +50,17 @@ static char tspace[1024]; static struct ubik_client *uclient; -static int GetClientAddrsCmd(struct cmd_syndesc *asp, char *arock); -static int SetClientAddrsCmd(struct cmd_syndesc *asp, char *arock); -static int FlushMountCmd(struct cmd_syndesc *asp, char *arock); -static int RxStatProcCmd(struct cmd_syndesc *asp, char *arock); -static int RxStatPeerCmd(struct cmd_syndesc *asp, char *arock); +static int GetClientAddrsCmd(struct cmd_syndesc *asp, void *arock); +static int SetClientAddrsCmd(struct cmd_syndesc *asp, void *arock); +static int FlushMountCmd(struct cmd_syndesc *asp, void *arock); +static int RxStatProcCmd(struct cmd_syndesc *asp, void *arock); +static int RxStatPeerCmd(struct cmd_syndesc *asp, void *arock); extern struct cmd_syndesc *cmd_CreateSyntax(); -static int MemDumpCmd(struct cmd_syndesc *asp, char *arock); -static int CSCPolicyCmd(struct cmd_syndesc *asp, char *arock); -static int MiniDumpCmd(struct cmd_syndesc *asp, char *arock); +static int MemDumpCmd(struct cmd_syndesc *asp, void *arock); +static int CSCPolicyCmd(struct cmd_syndesc *asp, void *arock); +static int MiniDumpCmd(struct cmd_syndesc *asp, void *arock); static char pn[] = "fs"; static int rxInitDone = 0; @@ -873,7 +873,7 @@ static BOOL IsAdmin (void) } static int -SetACLCmd(struct cmd_syndesc *as, char *arock) +SetACLCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -1003,7 +1003,7 @@ SetACLCmd(struct cmd_syndesc *as, char *arock) } static int -CopyACLCmd(struct cmd_syndesc *as, char *arock) +CopyACLCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -1179,7 +1179,7 @@ CleanAcl(struct Acl *aa, char *fname) /* clean up an acl to not have bogus entries */ static int -CleanACLCmd(struct cmd_syndesc *as, char *arock) +CleanACLCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct Acl *ta = 0; @@ -1266,7 +1266,7 @@ CleanACLCmd(struct cmd_syndesc *as, char *arock) } static int -ListACLCmd(struct cmd_syndesc *as, char *arock) +ListACLCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct Acl *ta = 0; @@ -1332,7 +1332,7 @@ ListACLCmd(struct cmd_syndesc *as, char *arock) } static int -FlushAllCmd(struct cmd_syndesc *as, char *arock) +FlushAllCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -1347,7 +1347,7 @@ FlushAllCmd(struct cmd_syndesc *as, char *arock) } static int -FlushVolumeCmd(struct cmd_syndesc *as, char *arock) +FlushVolumeCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -1369,7 +1369,7 @@ FlushVolumeCmd(struct cmd_syndesc *as, char *arock) } static int -FlushCmd(struct cmd_syndesc *as, char *arock) +FlushCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -1397,7 +1397,7 @@ FlushCmd(struct cmd_syndesc *as, char *arock) /* all this command does is repackage its args and call SetVolCmd */ static int -SetQuotaCmd(struct cmd_syndesc *as, char *arock) { +SetQuotaCmd(struct cmd_syndesc *as, void *arock) { struct cmd_syndesc ts; /* copy useful stuff from our command slot; we may later have to reorder */ @@ -1406,7 +1406,7 @@ SetQuotaCmd(struct cmd_syndesc *as, char *arock) { } static int -SetVolCmd(struct cmd_syndesc *as, char *arock) { +SetVolCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; struct cmd_item *ti; @@ -1482,7 +1482,7 @@ struct VenusFid { #endif /* WIN32 */ static int -ExamineCmd(struct cmd_syndesc *as, char *arock) +ExamineCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -1545,7 +1545,7 @@ ExamineCmd(struct cmd_syndesc *as, char *arock) } static int -ListQuotaCmd(struct cmd_syndesc *as, char *arock) +ListQuotaCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -1577,7 +1577,7 @@ ListQuotaCmd(struct cmd_syndesc *as, char *arock) } static int -WhereIsCmd(struct cmd_syndesc *as, char *arock) +WhereIsCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -1616,7 +1616,7 @@ WhereIsCmd(struct cmd_syndesc *as, char *arock) static int -DiskFreeCmd(struct cmd_syndesc *as, char *arock) +DiskFreeCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -1647,7 +1647,7 @@ DiskFreeCmd(struct cmd_syndesc *as, char *arock) } static int -QuotaCmd(struct cmd_syndesc *as, char *arock) +QuotaCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -1679,7 +1679,7 @@ QuotaCmd(struct cmd_syndesc *as, char *arock) } static int -ListMountCmd(struct cmd_syndesc *as, char *arock) +ListMountCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -1831,7 +1831,7 @@ ListMountCmd(struct cmd_syndesc *as, char *arock) } static int -MakeMountCmd(struct cmd_syndesc *as, char *arock) +MakeMountCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; char *cellName, *volName, *tmpName; @@ -1973,7 +1973,7 @@ MakeMountCmd(struct cmd_syndesc *as, char *arock) * tp: Set to point to the actual name of the mount point to nuke. */ static int -RemoveMountCmd(struct cmd_syndesc *as, char *arock) { +RemoveMountCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code=0; struct ViceIoctl blob; struct cmd_item *ti; @@ -2049,7 +2049,7 @@ RemoveMountCmd(struct cmd_syndesc *as, char *arock) { */ static int -CheckServersCmd(struct cmd_syndesc *as, char *arock) +CheckServersCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -2155,7 +2155,7 @@ CheckServersCmd(struct cmd_syndesc *as, char *arock) } static int -MessagesCmd(struct cmd_syndesc *as, char *arock) +MessagesCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code=0; struct ViceIoctl blob; @@ -2198,7 +2198,7 @@ MessagesCmd(struct cmd_syndesc *as, char *arock) } static int -CheckVolumesCmd(struct cmd_syndesc *as, char *arock) +CheckVolumesCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -2216,7 +2216,7 @@ CheckVolumesCmd(struct cmd_syndesc *as, char *arock) } static int -SetCacheSizeCmd(struct cmd_syndesc *as, char *arock) +SetCacheSizeCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -2261,7 +2261,7 @@ SetCacheSizeCmd(struct cmd_syndesc *as, char *arock) #define MAXGCSIZE 16 static int -GetCacheParmsCmd(struct cmd_syndesc *as, char *arock) +GetCacheParmsCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -2286,7 +2286,7 @@ GetCacheParmsCmd(struct cmd_syndesc *as, char *arock) } static int -ListCellsCmd(struct cmd_syndesc *as, char *arock) +ListCellsCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; afs_int32 i, j, *lp, magic, size; @@ -2346,7 +2346,7 @@ ListCellsCmd(struct cmd_syndesc *as, char *arock) #ifndef WIN32 static int -ListAliasesCmd(struct cmd_syndesc *as, char *arock) +ListAliasesCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code, i; char *tp, *aliasName, *realName; @@ -2376,7 +2376,7 @@ ListAliasesCmd(struct cmd_syndesc *as, char *arock) } static int -CallBackRxConnCmd(struct cmd_syndesc *as, char *arock) +CallBackRxConnCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -2416,7 +2416,7 @@ CallBackRxConnCmd(struct cmd_syndesc *as, char *arock) #endif /* WIN32 */ static int -NewCellCmd(struct cmd_syndesc *as, char *arock) +NewCellCmd(struct cmd_syndesc *as, void *arock) { #ifndef WIN32 afs_int32 code, linkedstate=0, size=0, *lp; @@ -2513,7 +2513,7 @@ NewCellCmd(struct cmd_syndesc *as, char *arock) #ifndef WIN32 static int -NewAliasCmd(struct cmd_syndesc *as, char *arock) +NewAliasCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -2549,7 +2549,7 @@ NewAliasCmd(struct cmd_syndesc *as, char *arock) #endif /* WIN32 */ static int -WhichCellCmd(struct cmd_syndesc *as, char *arock) +WhichCellCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct cmd_item *ti; @@ -2573,7 +2573,7 @@ WhichCellCmd(struct cmd_syndesc *as, char *arock) } static int -WSCellCmd(struct cmd_syndesc *as, char *arock) +WSCellCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -2596,7 +2596,7 @@ WSCellCmd(struct cmd_syndesc *as, char *arock) /* static int -PrimaryCellCmd(struct cmd_syndesc *as, char *arock) +PrimaryCellCmd(struct cmd_syndesc *as, void *arock) { fprintf(stderr,"This command is obsolete, as is the concept of a primary token.\n"); return 0; @@ -2604,7 +2604,7 @@ PrimaryCellCmd(struct cmd_syndesc *as, char *arock) */ static int -MonitorCmd(struct cmd_syndesc *as, char *arock) +MonitorCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -2664,7 +2664,7 @@ MonitorCmd(struct cmd_syndesc *as, char *arock) } static int -SysNameCmd(struct cmd_syndesc *as, char *arock) +SysNameCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -2734,7 +2734,7 @@ SysNameCmd(struct cmd_syndesc *as, char *arock) } static char *exported_types[] = {"null", "nfs", ""}; -static int ExportAfsCmd(struct cmd_syndesc *as, char *arock) +static int ExportAfsCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -2837,7 +2837,7 @@ static int ExportAfsCmd(struct cmd_syndesc *as, char *arock) static int -GetCellCmd(struct cmd_syndesc *as, char *arock) +GetCellCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -2886,7 +2886,7 @@ GetCellCmd(struct cmd_syndesc *as, char *arock) return error; } -static int SetCellCmd(struct cmd_syndesc *as, char *arock) +static int SetCellCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -3173,7 +3173,7 @@ static BOOL IsWindowsNT (void) #ifdef WIN32 static int -SetPrefCmd(struct cmd_syndesc *as, char * arock) +SetPrefCmd(struct cmd_syndesc *as, void * arock) { FILE *infd; afs_int32 code; @@ -3263,7 +3263,7 @@ SetPrefCmd(struct cmd_syndesc *as, char * arock) } #else static int -SetPrefCmd(struct cmd_syndesc *as, char *arock) +SetPrefCmd(struct cmd_syndesc *as, void *arock) { FILE *infd; afs_int32 code; @@ -3369,7 +3369,7 @@ SetPrefCmd(struct cmd_syndesc *as, char *arock) #ifdef WIN32 static int -GetPrefCmd(struct cmd_syndesc *as, char *arock) +GetPrefCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct cmd_item *ti; @@ -3440,7 +3440,7 @@ GetPrefCmd(struct cmd_syndesc *as, char *arock) } #else static int -GetPrefCmd(struct cmd_syndesc *as, char *arock) +GetPrefCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct cmd_item *ti; @@ -3511,7 +3511,7 @@ GetPrefCmd(struct cmd_syndesc *as, char *arock) #endif /* WIN32 */ static int -TraceCmd(struct cmd_syndesc *asp, char *arock) +TraceCmd(struct cmd_syndesc *asp, void *arock) { long code; struct ViceIoctl blob; @@ -3573,7 +3573,7 @@ static void sbusage(void) /* fs sb -kbytes 9999 -files *.o -default 64 */ static int -StoreBehindCmd(struct cmd_syndesc *as, char *arock) +StoreBehindCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code = 0; struct ViceIoctl blob; @@ -3680,7 +3680,7 @@ StoreBehindCmd(struct cmd_syndesc *as, char *arock) } static afs_int32 -SetCryptCmd(struct cmd_syndesc *as, char *arock) +SetCryptCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code = 0, flag; struct ViceIoctl blob; @@ -3713,7 +3713,7 @@ SetCryptCmd(struct cmd_syndesc *as, char *arock) } static afs_int32 -GetCryptCmd(struct cmd_syndesc *as, char *arock) +GetCryptCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code = 0, flag; struct ViceIoctl blob; @@ -3741,7 +3741,7 @@ GetCryptCmd(struct cmd_syndesc *as, char *arock) } static int -MemDumpCmd(struct cmd_syndesc *asp, char *arock) +MemDumpCmd(struct cmd_syndesc *asp, void *arock) { long code; struct ViceIoctl blob; @@ -3786,7 +3786,7 @@ MemDumpCmd(struct cmd_syndesc *asp, char *arock) } static int -MiniDumpCmd(struct cmd_syndesc *asp, char *arock) +MiniDumpCmd(struct cmd_syndesc *asp, void *arock) { BOOL success = 0; SERVICE_STATUS status; @@ -3827,7 +3827,7 @@ MiniDumpCmd(struct cmd_syndesc *asp, char *arock) } static int -CSCPolicyCmd(struct cmd_syndesc *asp, char *arock) +CSCPolicyCmd(struct cmd_syndesc *asp, void *arock) { struct cmd_item *ti; char *share = NULL; @@ -3941,7 +3941,7 @@ CSCPolicyCmd(struct cmd_syndesc *asp, char *arock) #ifndef WIN32 /* get clients interface addresses */ static int -GetClientAddrsCmd(struct cmd_syndesc *as, char *arock) +GetClientAddrsCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct cmd_item *ti; @@ -3987,7 +3987,7 @@ GetClientAddrsCmd(struct cmd_syndesc *as, char *arock) } static int -SetClientAddrsCmd(struct cmd_syndesc *as, char *arock) +SetClientAddrsCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code, addr; struct cmd_item *ti; @@ -4061,7 +4061,7 @@ SetClientAddrsCmd(struct cmd_syndesc *as, char *arock) } static int -FlushMountCmd(struct cmd_syndesc *as, char *arock) +FlushMountCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -4178,7 +4178,7 @@ FlushMountCmd(struct cmd_syndesc *as, char *arock) #endif /* WIN32 */ static int -RxStatProcCmd(struct cmd_syndesc *as, char *arock) +RxStatProcCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; afs_int32 flags = 0; @@ -4213,7 +4213,7 @@ RxStatProcCmd(struct cmd_syndesc *as, char *arock) } static int -RxStatPeerCmd(struct cmd_syndesc *as, char *arock) +RxStatPeerCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; afs_int32 flags = 0; @@ -4280,32 +4280,32 @@ main(int argc, char **argv) osi_Init(); #ifndef WIN32 - ts = cmd_CreateSyntax("getclientaddrs", GetClientAddrsCmd, 0, + ts = cmd_CreateSyntax("getclientaddrs", GetClientAddrsCmd, NULL, "get client network interface addresses"); cmd_CreateAlias(ts, "gc"); - ts = cmd_CreateSyntax("setclientaddrs", SetClientAddrsCmd, 0, + ts = cmd_CreateSyntax("setclientaddrs", SetClientAddrsCmd, NULL, "set client network interface addresses"); cmd_AddParm(ts, "-address", CMD_LIST, CMD_OPTIONAL | CMD_EXPANDS, "client network interfaces"); cmd_CreateAlias(ts, "sc"); #endif /* WIN32 */ - ts = cmd_CreateSyntax("setserverprefs", SetPrefCmd, 0, "set server ranks"); + ts = cmd_CreateSyntax("setserverprefs", SetPrefCmd, NULL, "set server ranks"); cmd_AddParm(ts, "-servers", CMD_LIST, CMD_OPTIONAL|CMD_EXPANDS, "fileserver names and ranks"); cmd_AddParm(ts, "-vlservers", CMD_LIST, CMD_OPTIONAL|CMD_EXPANDS, "VL server names and ranks"); cmd_AddParm(ts, "-file", CMD_SINGLE, CMD_OPTIONAL, "input from named file"); cmd_AddParm(ts, "-stdin", CMD_FLAG, CMD_OPTIONAL, "input from stdin"); cmd_CreateAlias(ts, "sp"); - ts = cmd_CreateSyntax("getserverprefs", GetPrefCmd, 0, "get server ranks"); + ts = cmd_CreateSyntax("getserverprefs", GetPrefCmd, NULL, "get server ranks"); cmd_AddParm(ts, "-file", CMD_SINGLE, CMD_OPTIONAL, "output to named file"); cmd_AddParm(ts, "-numeric", CMD_FLAG, CMD_OPTIONAL, "addresses only"); cmd_AddParm(ts, "-vlservers", CMD_FLAG, CMD_OPTIONAL, "VL servers"); /* cmd_AddParm(ts, "-cell", CMD_FLAG, CMD_OPTIONAL, "cellname"); */ cmd_CreateAlias(ts, "gp"); - ts = cmd_CreateSyntax("setacl", SetACLCmd, 0, "set access control list"); + ts = cmd_CreateSyntax("setacl", SetACLCmd, NULL, "set access control list"); cmd_AddParm(ts, "-dir", CMD_LIST, 0, "directory"); cmd_AddParm(ts, "-acl", CMD_LIST, 0, "access list entries"); cmd_AddParm(ts, "-clear", CMD_FLAG, CMD_OPTIONAL, "clear access list"); @@ -4315,17 +4315,17 @@ main(int argc, char **argv) cmd_AddParm(ts, "-if", CMD_FLAG, CMD_OPTIONAL, "initial file acl (DFS only)"); cmd_CreateAlias(ts, "sa"); - ts = cmd_CreateSyntax("listacl", ListACLCmd, 0, "list access control list"); + ts = cmd_CreateSyntax("listacl", ListACLCmd, NULL, "list access control list"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); parm_listacl_id = ts->nParms; cmd_AddParm(ts, "-id", CMD_FLAG, CMD_OPTIONAL, "initial directory acl"); cmd_AddParm(ts, "-if", CMD_FLAG, CMD_OPTIONAL, "initial file acl"); cmd_CreateAlias(ts, "la"); - ts = cmd_CreateSyntax("cleanacl", CleanACLCmd, 0, "clean up access control list"); + ts = cmd_CreateSyntax("cleanacl", CleanACLCmd, NULL, "clean up access control list"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); - ts = cmd_CreateSyntax("copyacl", CopyACLCmd, 0, "copy access control list"); + ts = cmd_CreateSyntax("copyacl", CopyACLCmd, NULL, "copy access control list"); cmd_AddParm(ts, "-fromdir", CMD_SINGLE, 0, "source directory (or DFS file)"); cmd_AddParm(ts, "-todir", CMD_LIST, 0, "destination directory (or DFS file)"); cmd_AddParm(ts, "-clear", CMD_FLAG, CMD_OPTIONAL, "first clear dest access list"); @@ -4335,16 +4335,16 @@ main(int argc, char **argv) cmd_CreateAlias(ts, "ca"); - ts = cmd_CreateSyntax("flush", FlushCmd, 0, "flush file from cache"); + ts = cmd_CreateSyntax("flush", FlushCmd, NULL, "flush file from cache"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); #ifndef WIN32 - ts = cmd_CreateSyntax("flushmount", FlushMountCmd, 0, + ts = cmd_CreateSyntax("flushmount", FlushMountCmd, NULL, "flush mount symlink from cache"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); #endif - ts = cmd_CreateSyntax("setvol", SetVolCmd, 0, "set volume status"); + ts = cmd_CreateSyntax("setvol", SetVolCmd, NULL, "set volume status"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); cmd_AddParm(ts, "-max", CMD_SINGLE, CMD_OPTIONAL, "disk space quota in 1K units"); #ifdef notdef @@ -4354,29 +4354,29 @@ main(int argc, char **argv) cmd_AddParm(ts, "-offlinemsg", CMD_SINGLE, CMD_OPTIONAL, "offline message"); cmd_CreateAlias(ts, "sv"); - ts = cmd_CreateSyntax("messages", MessagesCmd, 0, "control Cache Manager messages"); + ts = cmd_CreateSyntax("messages", MessagesCmd, NULL, "control Cache Manager messages"); cmd_AddParm(ts, "-show", CMD_SINGLE, CMD_OPTIONAL, "[user|console|all|none]"); - ts = cmd_CreateSyntax("examine", ExamineCmd, 0, "display file/volume status"); + ts = cmd_CreateSyntax("examine", ExamineCmd, NULL, "display file/volume status"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); cmd_CreateAlias(ts, "lv"); cmd_CreateAlias(ts, "listvol"); - ts = cmd_CreateSyntax("listquota", ListQuotaCmd, 0, "list volume quota"); + ts = cmd_CreateSyntax("listquota", ListQuotaCmd, NULL, "list volume quota"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); cmd_CreateAlias(ts, "lq"); - ts = cmd_CreateSyntax("diskfree", DiskFreeCmd, 0, "show server disk space usage"); + ts = cmd_CreateSyntax("diskfree", DiskFreeCmd, NULL, "show server disk space usage"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); cmd_CreateAlias(ts, "df"); - ts = cmd_CreateSyntax("quota", QuotaCmd, 0, "show volume quota usage"); + ts = cmd_CreateSyntax("quota", QuotaCmd, NULL, "show volume quota usage"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); - ts = cmd_CreateSyntax("lsmount", ListMountCmd, 0, "list mount point"); + ts = cmd_CreateSyntax("lsmount", ListMountCmd, NULL, "list mount point"); cmd_AddParm(ts, "-dir", CMD_LIST, 0, "directory"); - ts = cmd_CreateSyntax("mkmount", MakeMountCmd, 0, "make mount point"); + ts = cmd_CreateSyntax("mkmount", MakeMountCmd, NULL, "make mount point"); cmd_AddParm(ts, "-dir", CMD_SINGLE, 0, "directory"); cmd_AddParm(ts, "-vol", CMD_SINGLE, 0, "volume name"); cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cell name"); @@ -4391,31 +4391,31 @@ main(int argc, char **argv) */ - ts = cmd_CreateSyntax("rmmount", RemoveMountCmd, 0, "remove mount point"); + ts = cmd_CreateSyntax("rmmount", RemoveMountCmd, NULL, "remove mount point"); cmd_AddParm(ts, "-dir", CMD_LIST, 0, "directory"); - ts = cmd_CreateSyntax("checkservers", CheckServersCmd, 0, "check local cell's servers"); + ts = cmd_CreateSyntax("checkservers", CheckServersCmd, NULL, "check local cell's servers"); cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cell to check"); cmd_AddParm(ts, "-all", CMD_FLAG, CMD_OPTIONAL, "check all cells"); cmd_AddParm(ts, "-fast", CMD_FLAG, CMD_OPTIONAL, "just list, don't check"); cmd_AddParm(ts,"-interval",CMD_SINGLE,CMD_OPTIONAL,"seconds between probes"); - ts = cmd_CreateSyntax("checkvolumes", CheckVolumesCmd,0, "check volumeID/name mappings"); + ts = cmd_CreateSyntax("checkvolumes", CheckVolumesCmd, NULL, "check volumeID/name mappings"); cmd_CreateAlias(ts, "checkbackups"); - ts = cmd_CreateSyntax("setcachesize", SetCacheSizeCmd, 0, "set cache size"); + ts = cmd_CreateSyntax("setcachesize", SetCacheSizeCmd, NULL, "set cache size"); cmd_AddParm(ts, "-blocks", CMD_SINGLE, CMD_OPTIONAL, "size in 1K byte blocks (0 => reset)"); cmd_CreateAlias(ts, "cachesize"); cmd_AddParm(ts, "-reset", CMD_FLAG, CMD_OPTIONAL, "reset size back to boot value"); - ts = cmd_CreateSyntax("getcacheparms", GetCacheParmsCmd, 0, "get cache usage info"); + ts = cmd_CreateSyntax("getcacheparms", GetCacheParmsCmd, NULL, "get cache usage info"); - ts = cmd_CreateSyntax("listcells", ListCellsCmd, 0, "list configured cells"); + ts = cmd_CreateSyntax("listcells", ListCellsCmd, NULL, "list configured cells"); cmd_AddParm(ts, "-numeric", CMD_FLAG, CMD_OPTIONAL, "addresses only"); - ts = cmd_CreateSyntax("setquota", SetQuotaCmd, 0, "set volume quota"); + ts = cmd_CreateSyntax("setquota", SetQuotaCmd, NULL, "set volume quota"); cmd_AddParm(ts, "-path", CMD_SINGLE, CMD_OPTIONAL, "dir/file path"); cmd_AddParm(ts, "-max", CMD_SINGLE, 0, "max quota in kbytes"); #ifdef notdef @@ -4423,7 +4423,7 @@ main(int argc, char **argv) #endif cmd_CreateAlias(ts, "sq"); - ts = cmd_CreateSyntax("newcell", NewCellCmd, 0, "configure new cell"); + ts = cmd_CreateSyntax("newcell", NewCellCmd, NULL, "configure new cell"); #ifndef WIN32 cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "cell name"); cmd_AddParm(ts, "-servers", CMD_LIST, CMD_REQUIRED, "primary servers"); @@ -4440,46 +4440,46 @@ main(int argc, char **argv) cmd_AddParm(ts, "-vlport", CMD_SINGLE, CMD_OPTIONAL, "cell's vldb server port"); #endif - ts = cmd_CreateSyntax("newalias", NewAliasCmd, 0, + ts = cmd_CreateSyntax("newalias", NewAliasCmd, NULL, "configure new cell alias"); cmd_AddParm(ts, "-alias", CMD_SINGLE, 0, "alias name"); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "real name of cell"); #endif - ts = cmd_CreateSyntax("whichcell", WhichCellCmd, 0, "list file's cell"); + ts = cmd_CreateSyntax("whichcell", WhichCellCmd, NULL, "list file's cell"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); - ts = cmd_CreateSyntax("whereis", WhereIsCmd, 0, "list file's location"); + ts = cmd_CreateSyntax("whereis", WhereIsCmd, NULL, "list file's location"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); - ts = cmd_CreateSyntax("wscell", WSCellCmd, 0, "list workstation's cell"); + ts = cmd_CreateSyntax("wscell", WSCellCmd, NULL, "list workstation's cell"); /* ts = cmd_CreateSyntax("primarycell", PrimaryCellCmd, 0, "obsolete (listed primary cell)"); */ - ts = cmd_CreateSyntax("monitor", MonitorCmd, 0, "set cache monitor host address"); + ts = cmd_CreateSyntax("monitor", MonitorCmd, NULL, "set cache monitor host address"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "host name or 'off'"); cmd_CreateAlias(ts, "mariner"); - ts = cmd_CreateSyntax("getcellstatus", GetCellCmd, 0, "get cell status"); + ts = cmd_CreateSyntax("getcellstatus", GetCellCmd, NULL, "get cell status"); cmd_AddParm(ts, "-cell", CMD_LIST, 0, "cell name"); - ts = cmd_CreateSyntax("setcell", SetCellCmd, 0, "set cell status"); + ts = cmd_CreateSyntax("setcell", SetCellCmd, NULL, "set cell status"); cmd_AddParm(ts, "-cell", CMD_LIST, 0, "cell name"); cmd_AddParm(ts, "-suid", CMD_FLAG, CMD_OPTIONAL, "allow setuid programs"); cmd_AddParm(ts, "-nosuid", CMD_FLAG, CMD_OPTIONAL, "disallow setuid programs"); - ts = cmd_CreateSyntax("flushall", FlushAllCmd, 0, "flush all data"); + ts = cmd_CreateSyntax("flushall", FlushAllCmd, NULL, "flush all data"); - ts = cmd_CreateSyntax("flushvolume", FlushVolumeCmd, 0, "flush all data in volume"); + ts = cmd_CreateSyntax("flushvolume", FlushVolumeCmd, NULL, "flush all data in volume"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); - ts = cmd_CreateSyntax("sysname", SysNameCmd, 0, "get/set sysname (i.e. @sys) value"); + ts = cmd_CreateSyntax("sysname", SysNameCmd, NULL, "get/set sysname (i.e. @sys) value"); cmd_AddParm(ts, "-newsys", CMD_LIST, CMD_OPTIONAL, "new sysname"); - ts = cmd_CreateSyntax("exportafs", ExportAfsCmd, 0, "enable/disable translators to AFS"); + ts = cmd_CreateSyntax("exportafs", ExportAfsCmd, NULL, "enable/disable translators to AFS"); cmd_AddParm(ts, "-type", CMD_SINGLE, 0, "exporter name"); cmd_AddParm(ts, "-start", CMD_SINGLE, CMD_OPTIONAL, "start/stop translator ('on' or 'off')"); cmd_AddParm(ts, "-convert", CMD_SINGLE, CMD_OPTIONAL, "convert from afs to unix mode ('on or 'off')"); diff --git a/src/WINNT/afsd/sample/token.c b/src/WINNT/afsd/sample/token.c index ae384ca05..305c0e8a1 100644 --- a/src/WINNT/afsd/sample/token.c +++ b/src/WINNT/afsd/sample/token.c @@ -18,7 +18,7 @@ #define KABADARGUMENT 1 #define KLOGEXIT(code) exit(code) -int CommandProc(); +int CommandProc(struct cmd_syndesc *, void *); static int zero_argc; static char **zero_argv; @@ -36,7 +36,7 @@ void main (argc, argv) /* Start up sockets */ WSAStartup(0x0101, &WSAjunk); - ts = cmd_CreateSyntax((char *) 0, CommandProc, 0, "obtain Kerberos authentication"); + ts = cmd_CreateSyntax(NULL, CommandProc, NULL, "obtain Kerberos authentication"); #define aXFLAG 0 #define aPRINCIPAL 1 @@ -131,9 +131,8 @@ static int read_pw_string(char *s, int max) return !ok; } -CommandProc (as, arock) - char *arock; - struct cmd_syndesc *as; +int +CommandProc (struct cmd_syndesc *as, void *arock) { char name[MAXKTCNAMELEN]; char defaultCell[256]; diff --git a/src/WINNT/afsd/symlink.c b/src/WINNT/afsd/symlink.c index a14ba3647..ed8abb638 100644 --- a/src/WINNT/afsd/symlink.c +++ b/src/WINNT/afsd/symlink.c @@ -269,8 +269,8 @@ char *apath; { } -static ListLinkCmd(as) -register struct cmd_syndesc *as; { +static ListLinkCmd(register struct cmd_syndesc *as, void *arock) +{ register afs_int32 code; struct ViceIoctl blob; int error; @@ -420,8 +420,8 @@ register struct cmd_syndesc *as; { return error; } -static MakeLinkCmd(as) -register struct cmd_syndesc *as; { +static MakeLinkCmd(register struct cmd_syndesc *as, void *arock) +{ register afs_int32 code; struct ViceIoctl blob; char * parent; @@ -484,8 +484,8 @@ register struct cmd_syndesc *as; { * symlink (or ``.'' if none is provided) * tp: Set to point to the actual name of the symlink to nuke. */ -static RemoveLinkCmd(as) -register struct cmd_syndesc *as; { +static RemoveLinkCmd(register struct cmd_syndesc *as, void *arock) +{ register afs_int32 code=0; struct ViceIoctl blob; register struct cmd_item *ti; @@ -589,14 +589,14 @@ char **argv; { osi_Init(); - ts = cmd_CreateSyntax("list", ListLinkCmd, 0, "list symlink"); + ts = cmd_CreateSyntax("list", ListLinkCmd, NULL, "list symlink"); cmd_AddParm(ts, "-name", CMD_LIST, 0, "name"); - ts = cmd_CreateSyntax("make", MakeLinkCmd, 0, "make symlink"); + ts = cmd_CreateSyntax("make", MakeLinkCmd, NULL, "make symlink"); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "name"); cmd_AddParm(ts, "-to", CMD_SINGLE, 0, "target"); - ts = cmd_CreateSyntax("remove", RemoveLinkCmd, 0, "remove symlink"); + ts = cmd_CreateSyntax("remove", RemoveLinkCmd, NULL, "remove symlink"); cmd_AddParm(ts, "-name", CMD_LIST, 0, "name"); cmd_CreateAlias(ts, "rm"); diff --git a/src/WINNT/afsreg/test/regman.c b/src/WINNT/afsreg/test/regman.c index 454128885..b97c709ae 100644 --- a/src/WINNT/afsreg/test/regman.c +++ b/src/WINNT/afsreg/test/regman.c @@ -35,7 +35,7 @@ static char* whoami; -static int DoVptList(struct cmd_syndesc *as, char *arock) +static int DoVptList(struct cmd_syndesc *as, void *arock) { struct vpt_iter vpiter; struct vptab vpentry; @@ -51,7 +51,7 @@ static int DoVptList(struct cmd_syndesc *as, char *arock) return 0; } -static int DoVptAdd(struct cmd_syndesc *as, char *arock) +static int DoVptAdd(struct cmd_syndesc *as, void *arock) { char *vpName, *vpDev; struct vptab vpentry; @@ -79,7 +79,7 @@ static int DoVptAdd(struct cmd_syndesc *as, char *arock) return 0; } -static int DoVptDel(struct cmd_syndesc *as, char *arock) +static int DoVptDel(struct cmd_syndesc *as, void *arock) { char *vpName; @@ -98,7 +98,7 @@ static int DoVptDel(struct cmd_syndesc *as, char *arock) } -static int DoDirGet(struct cmd_syndesc *as, char *arock) +static int DoDirGet(struct cmd_syndesc *as, void *arock) { char *buf; @@ -115,7 +115,7 @@ static int DoDirGet(struct cmd_syndesc *as, char *arock) } -static int DoDirSet(struct cmd_syndesc *as, char *arock) +static int DoDirSet(struct cmd_syndesc *as, void *arock) { long status; HKEY key; @@ -143,7 +143,7 @@ static int DoDirSet(struct cmd_syndesc *as, char *arock) } -static int DoBosCfg(struct cmd_syndesc *as, char *arock) +static int DoBosCfg(struct cmd_syndesc *as, void *arock) { char bosSvcPath[AFSDIR_PATH_MAX]; SC_HANDLE scmHandle, svcHandle; @@ -213,7 +213,7 @@ static int DoBosCfg(struct cmd_syndesc *as, char *arock) } -static int DoBosDel(struct cmd_syndesc *as, char *arock) +static int DoBosDel(struct cmd_syndesc *as, void *arock) { int rc = 0; SC_HANDLE scmHandle, svcHandle; @@ -258,7 +258,7 @@ static int DoBosDel(struct cmd_syndesc *as, char *arock) return (rc); } -static int DoVersionGet(struct cmd_syndesc *as, char *arock) +static int DoVersionGet(struct cmd_syndesc *as, void *arock) { unsigned major, minor, patch; @@ -286,15 +286,15 @@ SetupVptCmd(void) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax("vptlist", DoVptList, 0, + ts = cmd_CreateSyntax("vptlist", DoVptList, NULL, "list vice partition table"); - ts = cmd_CreateSyntax("vptadd", DoVptAdd, 0, + ts = cmd_CreateSyntax("vptadd", DoVptAdd, NULL, "add entry to vice partition table"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_REQUIRED, "partition name"); cmd_AddParm(ts, "-dev", CMD_SINGLE, CMD_REQUIRED, "device name"); - ts = cmd_CreateSyntax("vptdel", DoVptDel, 0, + ts = cmd_CreateSyntax("vptdel", DoVptDel, NULL, "remove entry from vice partition table"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_REQUIRED, "partition name"); } @@ -304,10 +304,10 @@ SetupDirCmd(void) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax("dirget", DoDirGet, 0, + ts = cmd_CreateSyntax("dirget", DoDirGet, NULL, "display the AFS server installation directory"); - ts = cmd_CreateSyntax("dirset", DoDirSet, 0, + ts = cmd_CreateSyntax("dirset", DoDirSet, NULL, "set the AFS server installation directory"); cmd_AddParm(ts, "-path", CMD_SINGLE, CMD_REQUIRED, "directory path"); } @@ -317,11 +317,11 @@ SetupBosCmd(void) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax("boscfg", DoBosCfg, 0, + ts = cmd_CreateSyntax("boscfg", DoBosCfg, NULL, "configure the AFS BOS control service"); cmd_AddParm(ts, "-path", CMD_SINGLE, CMD_OPTIONAL, "service binary path"); - ts = cmd_CreateSyntax("bosdel", DoBosDel, 0, + ts = cmd_CreateSyntax("bosdel", DoBosDel, NULL, "delete (unconfigure) the AFS BOS control service"); } @@ -330,7 +330,7 @@ SetupVersionCmd(void) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax("version", DoVersionGet, 0, + ts = cmd_CreateSyntax("version", DoVersionGet, NULL, "display AFS version information"); } diff --git a/src/afsd/afsd.c b/src/afsd/afsd.c index 776fbc980..f20b9b9fd 100644 --- a/src/afsd/afsd.c +++ b/src/afsd/afsd.c @@ -1513,7 +1513,7 @@ AfsdbLookupHandler() #endif #endif -mainproc(struct cmd_syndesc *as, char *arock) +mainproc(struct cmd_syndesc *as, void *arock) { static char rn[] = "afsd"; /*Name of this routine */ afs_int32 code; /*Result of fork() */ diff --git a/src/afsmonitor/afsmonitor.c b/src/afsmonitor/afsmonitor.c index 002905e4a..345004c66 100644 --- a/src/afsmonitor/afsmonitor.c +++ b/src/afsmonitor/afsmonitor.c @@ -3880,8 +3880,7 @@ afsmon_execute() *----------------------------------------------------------------------*/ int -afsmonInit(as) - struct cmd_syndesc *as; +afsmonInit(struct cmd_syndesc *as, void *arock) { /* afsmonInit() */ static char rn[] = "afsmonInit"; /* Routine name */ @@ -4185,7 +4184,7 @@ main(argc, argv) /* * Set up the commands we understand. */ - ts = cmd_CreateSyntax("initcmd", afsmonInit, 0, "initialize the program"); + ts = cmd_CreateSyntax("initcmd", afsmonInit, NULL, "initialize the program"); cmd_AddParm(ts, "-config", CMD_SINGLE, CMD_OPTIONAL, "configuration file"); cmd_AddParm(ts, "-frequency", CMD_SINGLE, CMD_OPTIONAL, diff --git a/src/afsweb/weblog.c b/src/afsweb/weblog.c index 9332fb41d..2a1064283 100644 --- a/src/afsweb/weblog.c +++ b/src/afsweb/weblog.c @@ -123,7 +123,7 @@ main(int argc, char **argv) zero_argc = argc; zero_argv = argv; - ts = cmd_CreateSyntax(NULL, CommandProc, 0, + ts = cmd_CreateSyntax(NULL, CommandProc, NULL, "obtain Kerberos authentication for web servers"); /* define the command line arguments */ @@ -803,10 +803,8 @@ getDFScreds(char *name, char *realm, char *passwd, afs_uint32 lifetime, * arrive through a pipe from the httpds, authenticates the user and * returns a token (or a failure message) over the pipe */ -CommandProc(as, arock) - char *arock; - struct cmd_syndesc *as; - +static int +CommandProc(struct cmd_syndesc *as, void *arock) { char name[MAXKTCNAMELEN]; char cell[MAXKTCREALMLEN]; diff --git a/src/bozo/bos.c b/src/bozo/bos.c index 4930098b0..990aa8fea 100644 --- a/src/bozo/bos.c +++ b/src/bozo/bos.c @@ -277,9 +277,8 @@ GetConn(as, aencrypt) return tconn; } -static -SetAuth(as) - struct cmd_syndesc *as; +static int +SetAuth(struct cmd_syndesc *as, void *arock) { register afs_int32 code; register struct rx_connection *tconn; @@ -348,9 +347,8 @@ CopyBytes(afd, acall) } } -static -Prune(as) - register struct cmd_syndesc *as; +static int +Prune(register struct cmd_syndesc *as, void *arock) { register afs_int32 code; register struct rx_connection *tconn; @@ -372,9 +370,8 @@ Prune(as) return code; } -static -Exec(as) - register struct cmd_syndesc *as; +static int +Exec(register struct cmd_syndesc *as, void *arock) { register struct rx_connection *tconn; register afs_int32 code; @@ -386,9 +383,8 @@ Exec(as) return code; } -static -GetDate(as) - register struct cmd_syndesc *as; +static int +GetDate(register struct cmd_syndesc *as, void *arock) { register afs_int32 code; char tbuffer[256]; @@ -437,9 +433,8 @@ GetDate(as) return 0; } -static -UnInstall(as) - register struct cmd_syndesc *as; +static int +UnInstall(register struct cmd_syndesc *as, void *arock) { register afs_int32 code; char tbuffer[256]; @@ -496,9 +491,8 @@ GetServerGoal(aconn, aname) return BSTAT_NORMAL; } -static -Install(as) - struct cmd_syndesc *as; +static int +Install(struct cmd_syndesc *as, void *arock) { struct rx_connection *tconn; register afs_int32 code; @@ -554,9 +548,8 @@ Install(as) return 0; } -static -Shutdown(as) - struct cmd_syndesc *as; +static int +Shutdown(struct cmd_syndesc *as, void *arock) { register struct rx_connection *tconn; register afs_int32 code; @@ -584,10 +577,8 @@ Shutdown(as) return 0; } -static -BlockScannerCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +static int +BlockScannerCmd(struct cmd_syndesc *as, void *arock) { register afs_int32 code; struct rx_connection *tconn; @@ -602,10 +593,8 @@ BlockScannerCmd(as, arock) return 0; } -static -UnBlockScannerCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +static int +UnBlockScannerCmd(struct cmd_syndesc *as, void *arock) { register afs_int32 code; struct rx_connection *tconn; @@ -620,10 +609,8 @@ UnBlockScannerCmd(as, arock) return 0; } -static -GetRestartCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +static int +GetRestartCmd(struct cmd_syndesc *as, void *arock) { register afs_int32 code; struct ktime generalTime, newBinaryTime; @@ -665,10 +652,8 @@ GetRestartCmd(as, arock) return 0; } -static -SetRestartCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +static int +SetRestartCmd(struct cmd_syndesc *as, void *arock) { afs_int32 count; register afs_int32 code; @@ -707,9 +692,8 @@ SetRestartCmd(as, arock) return 0; } -static -Startup(as) - struct cmd_syndesc *as; +static int +Startup(struct cmd_syndesc *as, void *arock) { register struct rx_connection *tconn; register afs_int32 code; @@ -731,9 +715,8 @@ Startup(as) return 0; } -static -Restart(as) - struct cmd_syndesc *as; +static int +Restart(struct cmd_syndesc *as, void *arock) { register struct rx_connection *tconn; register afs_int32 code; @@ -777,9 +760,8 @@ Restart(as) return 0; } -static -SetCellName(as) - struct cmd_syndesc *as; +static int +SetCellName(struct cmd_syndesc *as, void *arock) { register struct rx_connection *tconn; register afs_int32 code; @@ -791,9 +773,8 @@ SetCellName(as) return 0; } -static -AddHost(as) - register struct cmd_syndesc *as; +static int +AddHost(register struct cmd_syndesc *as, void *arock) { register struct rx_connection *tconn; register afs_int32 code; @@ -819,9 +800,8 @@ AddHost(as) return 0; } -static -RemoveHost(as) - register struct cmd_syndesc *as; +static int +RemoveHost(register struct cmd_syndesc *as, void *arock) { register struct rx_connection *tconn; register afs_int32 code; @@ -837,9 +817,8 @@ RemoveHost(as) return 0; } -static -ListHosts(as) - register struct cmd_syndesc *as; +static int +ListHosts(register struct cmd_syndesc *as, void *arock) { register struct rx_connection *tconn; register afs_int32 code; @@ -868,9 +847,8 @@ ListHosts(as) return 0; } -static -AddKey(as) - register struct cmd_syndesc *as; +static int +AddKey(register struct cmd_syndesc *as, void *arock) { register struct rx_connection *tconn; register afs_int32 code; @@ -938,9 +916,8 @@ AddKey(as) return 0; } -static -RemoveKey(as) - register struct cmd_syndesc *as; +static int +RemoveKey(register struct cmd_syndesc *as, void *arock) { register struct rx_connection *tconn; register afs_int32 code; @@ -959,9 +936,8 @@ RemoveKey(as) return 0; } -static -ListKeys(as) - IN register struct cmd_syndesc *as; +static int +ListKeys(register struct cmd_syndesc *as, void *arock) { register struct rx_connection *tconn; register afs_int32 code; @@ -1000,9 +976,8 @@ ListKeys(as) return 0; } -static -AddSUser(as) - register struct cmd_syndesc *as; +static int +AddSUser(register struct cmd_syndesc *as, void *arock) { register struct rx_connection *tconn; register afs_int32 code; @@ -1021,9 +996,8 @@ AddSUser(as) return failed; } -static -RemoveSUser(as) - register struct cmd_syndesc *as; +static int +RemoveSUser(register struct cmd_syndesc *as, void *arock) { register struct rx_connection *tconn; register struct cmd_item *ti; @@ -1047,9 +1021,8 @@ RemoveSUser(as) } #define NPERLINE 10 /* dudes to print per line */ -static -ListSUsers(as) - register struct cmd_syndesc *as; +static int +ListSUsers(register struct cmd_syndesc *as, void *arock) { register struct rx_connection *tconn; register int i; @@ -1087,9 +1060,8 @@ ListSUsers(as) return 0; } -static -StatServer(as) - register struct cmd_syndesc *as; +static int +StatServer(register struct cmd_syndesc *as, void *arock) { register struct rx_connection *tconn; register afs_int32 code; @@ -1122,9 +1094,8 @@ StatServer(as) return 0; } -static -CreateServer(as) - register struct cmd_syndesc *as; +static int +CreateServer(register struct cmd_syndesc *as, void *arock) { register struct rx_connection *tconn; register afs_int32 code; @@ -1155,9 +1126,8 @@ CreateServer(as) return code; } -static -DeleteServer(as) - register struct cmd_syndesc *as; +static int +DeleteServer(register struct cmd_syndesc *as, void *arock) { register struct rx_connection *tconn; register afs_int32 code; @@ -1178,9 +1148,8 @@ DeleteServer(as) return code; } -static -StartServer(as) - register struct cmd_syndesc *as; +static int +StartServer(register struct cmd_syndesc *as, void *arock) { register struct rx_connection *tconn; register afs_int32 code; @@ -1197,9 +1166,8 @@ StartServer(as) return code; } -static -StopServer(as) - register struct cmd_syndesc *as; +static int +StopServer(register struct cmd_syndesc *as, void *arock) { register struct rx_connection *tconn; register afs_int32 code; @@ -1432,9 +1400,8 @@ DoSalvage(aconn, aparm1, aparm2, aoutName, showlog, parallel, atmpDir, return code; } -static -GetLogCmd(as) - register struct cmd_syndesc *as; +static int +GetLogCmd(register struct cmd_syndesc *as, void *arock) { struct rx_connection *tconn; register struct rx_call *tcall; @@ -1471,9 +1438,8 @@ GetLogCmd(as) return code; } -static -SalvageCmd(as) - struct cmd_syndesc *as; +static int +SalvageCmd(struct cmd_syndesc *as, void *arock) { register struct rx_connection *tconn; register afs_int32 code, rc, i; @@ -1867,9 +1833,8 @@ DoStat(aname, aconn, aint32p, firstTime) } #ifdef BOS_RESTRICTED_MODE -static -GetRestrict(as) - struct cmd_syndesc *as; +static int +GetRestrict(struct cmd_syndesc *as, void *arock) { register struct rx_connection *tconn; afs_int32 code, val; @@ -1884,9 +1849,8 @@ GetRestrict(as) return 0; } -static -SetRestrict(as) - struct cmd_syndesc *as; +static int +SetRestrict(struct cmd_syndesc *as, void *arock) { register struct rx_connection *tconn; afs_int32 code, val; @@ -1959,12 +1923,12 @@ main(argc, argv) initialize_CMD_error_table(); initialize_BZ_error_table(); - ts = cmd_CreateSyntax("start", StartServer, 0, "start running a server"); + ts = cmd_CreateSyntax("start", StartServer, NULL, "start running a server"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-instance", CMD_LIST, 0, "server process name"); add_std_args(ts); - ts = cmd_CreateSyntax("stop", StopServer, 0, "halt a server instance"); + ts = cmd_CreateSyntax("stop", StopServer, NULL, "halt a server instance"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-instance", CMD_LIST, 0, "server process name"); cmd_Seek(ts, 8); @@ -1972,7 +1936,7 @@ main(argc, argv) "wait for process to stop"); add_std_args(ts); - ts = cmd_CreateSyntax("status", StatServer, 0, + ts = cmd_CreateSyntax("status", StatServer, NULL, "show server instance status"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-instance", CMD_LIST, CMD_OPTIONAL, @@ -1980,7 +1944,7 @@ main(argc, argv) cmd_AddParm(ts, "-long", CMD_FLAG, CMD_OPTIONAL, "long status"); add_std_args(ts); - ts = cmd_CreateSyntax("shutdown", Shutdown, 0, "shutdown all processes"); + ts = cmd_CreateSyntax("shutdown", Shutdown, NULL, "shutdown all processes"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-instance", CMD_LIST, CMD_OPTIONAL, "instances"); cmd_Seek(ts, 8); @@ -1988,12 +1952,12 @@ main(argc, argv) "wait for process to stop"); add_std_args(ts); - ts = cmd_CreateSyntax("startup", Startup, 0, "start all processes"); + ts = cmd_CreateSyntax("startup", Startup, NULL, "start all processes"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-instance", CMD_LIST, CMD_OPTIONAL, "instances"); add_std_args(ts); - ts = cmd_CreateSyntax("restart", Restart, 0, "restart processes"); + ts = cmd_CreateSyntax("restart", Restart, NULL, "restart processes"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-instance", CMD_LIST, CMD_OPTIONAL, "instances"); cmd_AddParm(ts, "-bosserver", CMD_FLAG, CMD_OPTIONAL, @@ -2003,7 +1967,7 @@ main(argc, argv) #ifndef OPBOS - ts = cmd_CreateSyntax("create", CreateServer, 0, + ts = cmd_CreateSyntax("create", CreateServer, NULL, "create a new server instance"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-instance", CMD_SINGLE, 0, "server process name"); @@ -2013,105 +1977,105 @@ main(argc, argv) "Notifier program"); add_std_args(ts); - ts = cmd_CreateSyntax("delete", DeleteServer, 0, + ts = cmd_CreateSyntax("delete", DeleteServer, NULL, "delete a server instance"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-instance", CMD_LIST, 0, "server process name"); add_std_args(ts); - ts = cmd_CreateSyntax("adduser", AddSUser, 0, + ts = cmd_CreateSyntax("adduser", AddSUser, NULL, "add users to super-user list"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-user", CMD_LIST, 0, "user names"); add_std_args(ts); - ts = cmd_CreateSyntax("removeuser", RemoveSUser, 0, + ts = cmd_CreateSyntax("removeuser", RemoveSUser, NULL, "remove users from super-user list"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-user", CMD_LIST, 0, "user names"); add_std_args(ts); - ts = cmd_CreateSyntax("listusers", ListSUsers, 0, "list super-users"); + ts = cmd_CreateSyntax("listusers", ListSUsers, NULL, "list super-users"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); add_std_args(ts); - ts = cmd_CreateSyntax("addkey", AddKey, 0, + ts = cmd_CreateSyntax("addkey", AddKey, NULL, "add keys to key dbase (kvno 999 is bcrypt)"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-key", CMD_SINGLE, CMD_OPTIONAL, "key"); cmd_AddParm(ts, "-kvno", CMD_SINGLE, 0, "key version number"); add_std_args(ts); - ts = cmd_CreateSyntax("removekey", RemoveKey, 0, + ts = cmd_CreateSyntax("removekey", RemoveKey, NULL, "remove keys from key dbase"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-kvno", CMD_LIST, 0, "key version number"); add_std_args(ts); - ts = cmd_CreateSyntax("listkeys", ListKeys, 0, "list keys"); + ts = cmd_CreateSyntax("listkeys", ListKeys, NULL, "list keys"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-showkey", CMD_FLAG, CMD_OPTIONAL, "show the actual key rather than the checksum"); add_std_args(ts); - ts = cmd_CreateSyntax("listhosts", ListHosts, 0, "get cell host list"); + ts = cmd_CreateSyntax("listhosts", ListHosts, NULL, "get cell host list"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); add_std_args(ts); cmd_CreateAlias(ts, "getcell"); - ts = cmd_CreateSyntax("setcellname", SetCellName, 0, "set cell name"); + ts = cmd_CreateSyntax("setcellname", SetCellName, NULL, "set cell name"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "cell name"); add_std_args(ts); - ts = cmd_CreateSyntax("addhost", AddHost, 0, "add host to cell dbase"); + ts = cmd_CreateSyntax("addhost", AddHost, NULL, "add host to cell dbase"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-host", CMD_LIST, 0, "host name"); cmd_AddParm(ts, "-clone", CMD_FLAG, CMD_OPTIONAL, "vote doesn't count"); add_std_args(ts); - ts = cmd_CreateSyntax("removehost", RemoveHost, 0, + ts = cmd_CreateSyntax("removehost", RemoveHost, NULL, "remove host from cell dbase"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-host", CMD_LIST, 0, "host name"); add_std_args(ts); - ts = cmd_CreateSyntax("setauth", SetAuth, 0, + ts = cmd_CreateSyntax("setauth", SetAuth, NULL, "set authentication required flag"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-authrequired", CMD_SINGLE, 0, "on or off: authentication required for admin requests"); add_std_args(ts); - ts = cmd_CreateSyntax("install", Install, 0, "install program"); + ts = cmd_CreateSyntax("install", Install, NULL, "install program"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-file", CMD_LIST, 0, "files to install"); cmd_AddParm(ts, "-dir", CMD_SINGLE, CMD_OPTIONAL, "destination dir"); add_std_args(ts); - ts = cmd_CreateSyntax("uninstall", UnInstall, 0, "uninstall program"); + ts = cmd_CreateSyntax("uninstall", UnInstall, NULL, "uninstall program"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-file", CMD_LIST, 0, "files to uninstall"); cmd_AddParm(ts, "-dir", CMD_SINGLE, CMD_OPTIONAL, "destination dir"); add_std_args(ts); - ts = cmd_CreateSyntax("getlog", GetLogCmd, 0, "examine log file"); + ts = cmd_CreateSyntax("getlog", GetLogCmd, NULL, "examine log file"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-file", CMD_SINGLE, 0, "log file to examine"); add_std_args(ts); - ts = cmd_CreateSyntax("getdate", GetDate, 0, "get dates for programs"); + ts = cmd_CreateSyntax("getdate", GetDate, NULL, "get dates for programs"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-file", CMD_LIST, 0, "files to check"); cmd_AddParm(ts, "-dir", CMD_SINGLE, CMD_OPTIONAL, "destination dir"); add_std_args(ts); - ts = cmd_CreateSyntax("exec", Exec, 0, "execute shell command on server"); + ts = cmd_CreateSyntax("exec", Exec, NULL, "execute shell command on server"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-cmd", CMD_SINGLE, 0, "command to execute"); add_std_args(ts); - ts = cmd_CreateSyntax("prune", Prune, 0, "prune server files"); + ts = cmd_CreateSyntax("prune", Prune, NULL, "prune server files"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-bak", CMD_FLAG, CMD_OPTIONAL, "delete .BAK files"); cmd_AddParm(ts, "-old", CMD_FLAG, CMD_OPTIONAL, "delete .OLD files"); @@ -2119,7 +2083,7 @@ main(argc, argv) cmd_AddParm(ts, "-all", CMD_FLAG, CMD_OPTIONAL, "delete all junk files"); add_std_args(ts); - ts = cmd_CreateSyntax("setrestart", SetRestartCmd, 0, + ts = cmd_CreateSyntax("setrestart", SetRestartCmd, NULL, "set restart times"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "machine name"); cmd_AddParm(ts, "-time", CMD_SINGLE, CMD_REQUIRED, @@ -2130,12 +2094,12 @@ main(argc, argv) "set new binary restart time"); add_std_args(ts); - ts = cmd_CreateSyntax("getrestart", GetRestartCmd, 0, + ts = cmd_CreateSyntax("getrestart", GetRestartCmd, NULL, "get restart times"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "machine name"); add_std_args(ts); - ts = cmd_CreateSyntax("salvage", SalvageCmd, 0, + ts = cmd_CreateSyntax("salvage", SalvageCmd, NULL, "salvage partition or volumes"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, @@ -2191,23 +2155,23 @@ main(argc, argv) "(MR-AFS) Numeric mask of residencies to be included in the salvage. Do not use with -SalvageRemote or -SalvageArchival"); add_std_args(ts); - ts = cmd_CreateSyntax("blockscanner", BlockScannerCmd, 0, + ts = cmd_CreateSyntax("blockscanner", BlockScannerCmd, NULL, "block scanner daemon from making migration requests"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "machine name"); add_std_args(ts); - ts = cmd_CreateSyntax("unblockscanner", UnBlockScannerCmd, 0, + ts = cmd_CreateSyntax("unblockscanner", UnBlockScannerCmd, NULL, "allow scanner daemon to make migration requests again"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "machine name"); add_std_args(ts); #ifdef BOS_RESTRICTED_MODE - ts = cmd_CreateSyntax("getrestricted", GetRestrict, 0, + ts = cmd_CreateSyntax("getrestricted", GetRestrict, NULL, "get restrict mode"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); add_std_args(ts); - ts = cmd_CreateSyntax("setrestricted", SetRestrict, 0, + ts = cmd_CreateSyntax("setrestricted", SetRestrict, NULL, "set restrict mode"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-mode", CMD_SINGLE, 0, "mode to set"); diff --git a/src/bu_utils/fms.c b/src/bu_utils/fms.c index 42b46044b..15c085766 100644 --- a/src/bu_utils/fms.c +++ b/src/bu_utils/fms.c @@ -35,7 +35,7 @@ afs_int32 eotEnabled = 1; /* prototypes */ int fileMark(usd_handle_t hTape); int fileMarkSize(char *tapeDevice); -void tt_fileMarkSize(struct cmd_syndesc *as, char *arock); +static int tt_fileMarkSize(struct cmd_syndesc *as, void *arock); #define ERROR(evalue) \ { \ @@ -64,23 +64,23 @@ main(argc, argv) sigaction(SIGINT, &intaction, &oldaction); cptr = - cmd_CreateSyntax(NULL, tt_fileMarkSize, 0, + cmd_CreateSyntax(NULL, tt_fileMarkSize, NULL, "write a tape full of file marks"); cmd_AddParm(cptr, "-tape", CMD_SINGLE, CMD_REQUIRED, "tape special file"); cmd_Dispatch(argc, argv); } -void -tt_fileMarkSize(as, arock) - struct cmd_syndesc *as; - char *arock; +static int +tt_fileMarkSize(struct cmd_syndesc *as, void *arock) { char *tapeDevice; tapeDevice = as->parms[0].items->data; fileMarkSize(tapeDevice); + + return 0; } diff --git a/src/bucoord/commands.c b/src/bucoord/commands.c index 4ff455c8b..49b92e9a2 100644 --- a/src/bucoord/commands.c +++ b/src/bucoord/commands.c @@ -822,10 +822,8 @@ getPortOffset(port) /* bc_GetTapeStatusCmd * display status of all tasks on a particular tape coordinator */ - -bc_GetTapeStatusCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +int +bc_GetTapeStatusCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct rx_connection *tconn; @@ -920,10 +918,8 @@ bc_WaitForNoJobs() * parameters * ignored - a null "as" prints only jobs. */ - -bc_JobsCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +int +bc_JobsCmd(struct cmd_syndesc *as, void *arock) { afs_int32 prevTime; dlqlinkP ptr; @@ -1037,9 +1033,8 @@ bc_JobsCmd(as, arock) return 0; } -bc_KillCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +int +bc_KillCmd(struct cmd_syndesc *as, void *arock) { afs_int32 i; afs_int32 slot; @@ -1111,9 +1106,8 @@ bc_KillCmd(as, arock) } /* restore a volume or volumes */ -bc_VolRestoreCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +int +bc_VolRestoreCmd(struct cmd_syndesc *as, void *arock) { /* * parm 0 is the new server to restore to @@ -1266,9 +1260,8 @@ bc_VolRestoreCmd(as, arock) * various optional */ -bc_DiskRestoreCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +int +bc_DiskRestoreCmd(struct cmd_syndesc *as, void *arock) { struct bc_volumeSet tvolumeSet; /* temporary volume set for EvalVolumeSet call */ struct bc_volumeEntry tvolumeEntry; /* entry within the volume set */ @@ -1423,9 +1416,8 @@ bc_DiskRestoreCmd(as, arock) * restore a volumeset or list of volumes. */ -bc_VolsetRestoreCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +int +bc_VolsetRestoreCmd(struct cmd_syndesc *as, void *arock) { int oldFlag; long fromDate; @@ -1606,9 +1598,7 @@ bc_VolsetRestoreCmd(as, arock) int dontExecute; int -bc_DumpCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +bc_DumpCmd(struct cmd_syndesc *as, void *arock) { /*bc_DumpCmd */ static char rn[] = "bc_DumpCmd"; /*Routine name */ char *dumpPath, *vsName; /*Ptrs to various names */ @@ -1986,10 +1976,8 @@ bc_DumpCmd(as, arock) * parameters: * ignored */ - -bc_QuitCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +int +bc_QuitCmd(struct cmd_syndesc *as, void *arock) { int i; struct bc_dumpTask *td; @@ -2038,10 +2026,8 @@ bc_QuitCmd(as, arock) * Labels a tape i.e. request the tape coordinator to perform this * operation */ - -bc_LabelTapeCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +int +bc_LabelTapeCmd(struct cmd_syndesc *as, void *arock) { char *tapename = 0, *pname = 0; afs_int32 size; @@ -2101,10 +2087,8 @@ bc_LabelTapeCmd(as, arock) * params: * optional port number */ - -bc_ReadLabelCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +int +bc_ReadLabelCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; afs_int32 port = 0; @@ -2131,10 +2115,8 @@ bc_ReadLabelCmd(as, arock) * read content information from dump tapes, and if user desires, * add it to the database */ - -bc_ScanDumpsCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +int +bc_ScanDumpsCmd(struct cmd_syndesc *as, void *arock) { afs_int32 port = 0; afs_int32 dbAddFlag = 0; @@ -2242,10 +2224,8 @@ bc_ParseExpiration(paramPtr, expType, expDate) * Currently a single option, volumename to search for. Reports * all dumps containing the specified volume */ - -bc_dblookupCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +int +bc_dblookupCmd(struct cmd_syndesc *as, void *arock) { struct cmd_item *ciptr; afs_int32 code; @@ -2261,10 +2241,8 @@ bc_dblookupCmd(as, arock) /* for ubik version */ - -bc_dbVerifyCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +int +bc_dbVerifyCmd(struct cmd_syndesc *as, void *arock) { afs_int32 status; afs_int32 orphans; @@ -2420,10 +2398,8 @@ deleteDump(dumpid, port, force) * entry: * dump id - single required arg as param 0. */ - -bc_deleteDumpCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +int +bc_deleteDumpCmd(struct cmd_syndesc *as, void *arock) { afs_uint32 dumpid; afs_int32 code = 0; @@ -2576,9 +2552,8 @@ bc_deleteDumpCmd(as, arock) return (rcode); } -bc_saveDbCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +int +bc_saveDbCmd(struct cmd_syndesc *as, void *arock) { struct rx_connection *tconn; afs_int32 portOffset = 0; @@ -2646,9 +2621,8 @@ bc_saveDbCmd(as, arock) return (code); } -bc_restoreDbCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +int +bc_restoreDbCmd(struct cmd_syndesc *as, void *arock) { struct rx_connection *tconn; afs_int32 portOffset = 0; @@ -3151,9 +3125,8 @@ printRecentDumps(ndumps) * as - name of tape * arock - */ -bc_dumpInfoCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +int +bc_dumpInfoCmd(struct cmd_syndesc *as, void *arock) { afs_int32 dumpid; afs_int32 detailFlag; diff --git a/src/bucoord/dump_sched.c b/src/bucoord/dump_sched.c index e721ea0b5..13bc6fc6f 100644 --- a/src/bucoord/dump_sched.c +++ b/src/bucoord/dump_sched.c @@ -56,13 +56,11 @@ extern char *whoami; * parm 1: expiration date (list) */ -afs_int32 -bc_AddDumpCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +int +bc_AddDumpCmd(struct cmd_syndesc *as, void *arock) { register char *dname; /* dump schedule name */ - register afs_int32 code; + register int code; afs_int32 expType, expDate; register struct cmd_item *ti; udbClientTextP ctPtr; @@ -146,16 +144,14 @@ bc_AddDumpCmd(as, arock) * delete a dump schedule */ -afs_int32 -bc_DeleteDumpCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +int +bc_DeleteDumpCmd(struct cmd_syndesc *as, void *arock) { /* parm 0 is vol set name * parm 1 is dump schedule name */ register char *dname; - register afs_int32 code; + register int code; udbClientTextP ctPtr; /* lock schedules and check validity */ @@ -265,11 +261,11 @@ ListDumpSchedule(register struct bc_dumpSchedule *adump, int alevel) * ignored */ -afs_int32 -bc_ListDumpScheduleCmd(struct cmd_syndesc *as, char *arock) +int +bc_ListDumpScheduleCmd(struct cmd_syndesc *as, void *arock) { /* no parms */ - afs_int32 code; + int code; register struct bc_dumpSchedule *tdump; /* first check to see if schedules must be updated */ @@ -298,17 +294,15 @@ bc_ListDumpScheduleCmd(struct cmd_syndesc *as, char *arock) * parm 1: expiration date (list) */ -afs_int32 -bc_SetExpCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +int +bc_SetExpCmd(struct cmd_syndesc *as, void *arock) { register char *dname; /* dump schedule name */ register struct cmd_item *ti; struct bc_dumpSchedule *node, *parent; afs_int32 expType, expDate; udbClientTextP ctPtr; - register afs_int32 code; + register int code; afs_int32 bc_ParseExpiration(); diff --git a/src/bucoord/main.c b/src/bucoord/main.c index bf586b679..2136fe76d 100644 --- a/src/bucoord/main.c +++ b/src/bucoord/main.c @@ -326,8 +326,7 @@ backupInit() */ static int -MyBeforeProc(as) - register struct cmd_syndesc *as; +MyBeforeProc(register struct cmd_syndesc *as, void *arock) { afs_int32 code; @@ -462,9 +461,7 @@ doDispatch(targc, targv, dispatchCount) } int -bc_interactCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +bc_interactCmd(struct cmd_syndesc *as, void *arock) { interact = 1; return 0; @@ -516,7 +513,7 @@ main(argc, argv) cmd_SetBeforeProc(MyBeforeProc, NULL); - ts = cmd_CreateSyntax("dump", bc_DumpCmd, 0, "start dump"); + ts = cmd_CreateSyntax("dump", bc_DumpCmd, NULL, "start dump"); cmd_AddParm(ts, "-volumeset", CMD_SINGLE, CMD_OPTIONAL, "volume set name"); cmd_AddParm(ts, "-dump", CMD_SINGLE, CMD_OPTIONAL, "dump level name"); @@ -530,7 +527,7 @@ main(argc, argv) if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("volrestore", bc_VolRestoreCmd, 0, + ts = cmd_CreateSyntax("volrestore", bc_VolRestoreCmd, NULL, "restore volume"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "destination machine"); @@ -549,7 +546,7 @@ main(argc, argv) if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("diskrestore", bc_DiskRestoreCmd, 0, + ts = cmd_CreateSyntax("diskrestore", bc_DiskRestoreCmd, NULL, "restore partition"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "machine to restore"); @@ -567,9 +564,9 @@ main(argc, argv) if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("quit", bc_QuitCmd, 0, "leave the program"); + ts = cmd_CreateSyntax("quit", bc_QuitCmd, NULL, "leave the program"); - ts = cmd_CreateSyntax("volsetrestore", bc_VolsetRestoreCmd, 0, + ts = cmd_CreateSyntax("volsetrestore", bc_VolsetRestoreCmd, NULL, "restore a set of volumes"); cmd_AddParm(ts, "-name", CMD_SINGLE, CMD_OPTIONAL, "volume set name"); cmd_AddParm(ts, "-file", CMD_SINGLE, CMD_OPTIONAL, "file name"); @@ -580,7 +577,7 @@ main(argc, argv) if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("addhost", bc_AddHostCmd, 0, "add host to config"); + ts = cmd_CreateSyntax("addhost", bc_AddHostCmd, NULL, "add host to config"); cmd_AddParm(ts, "-tapehost", CMD_SINGLE, CMD_REQUIRED, "tape machine name"); cmd_AddParm(ts, "-portoffset", CMD_SINGLE, CMD_OPTIONAL, @@ -588,7 +585,7 @@ main(argc, argv) if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("delhost", bc_DeleteHostCmd, 0, + ts = cmd_CreateSyntax("delhost", bc_DeleteHostCmd, NULL, "delete host to config"); cmd_AddParm(ts, "-tapehost", CMD_SINGLE, CMD_REQUIRED, "tape machine name"); @@ -597,29 +594,29 @@ main(argc, argv) if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("listhosts", bc_ListHostsCmd, 0, + ts = cmd_CreateSyntax("listhosts", bc_ListHostsCmd, NULL, "list config hosts"); if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("jobs", bc_JobsCmd, 0, "list running jobs"); + ts = cmd_CreateSyntax("jobs", bc_JobsCmd, NULL, "list running jobs"); - ts = cmd_CreateSyntax("kill", bc_KillCmd, 0, "kill running job"); + ts = cmd_CreateSyntax("kill", bc_KillCmd, NULL, "kill running job"); cmd_AddParm(ts, "-id", CMD_SINGLE, CMD_REQUIRED, "job ID or dump set name"); - ts = cmd_CreateSyntax("listvolsets", bc_ListVolSetCmd, 0, + ts = cmd_CreateSyntax("listvolsets", bc_ListVolSetCmd, NULL, "list volume sets"); cmd_AddParm(ts, "-name", CMD_SINGLE, CMD_OPTIONAL, "volume set name"); if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("listdumps", bc_ListDumpScheduleCmd, 0, + ts = cmd_CreateSyntax("listdumps", bc_ListDumpScheduleCmd, NULL, "list dump schedules"); if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("addvolset", bc_AddVolSetCmd, 0, + ts = cmd_CreateSyntax("addvolset", bc_AddVolSetCmd, NULL, "create a new volume set"); cmd_AddParm(ts, "-name", CMD_SINGLE, CMD_REQUIRED, "volume set name"); cmd_AddParm(ts, "-temporary", CMD_FLAG, CMD_OPTIONAL, @@ -627,20 +624,20 @@ main(argc, argv) if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("status", bc_GetTapeStatusCmd, 0, + ts = cmd_CreateSyntax("status", bc_GetTapeStatusCmd, NULL, "get tape coordinator status"); cmd_AddParm(ts, "-portoffset", CMD_SINGLE, CMD_OPTIONAL, "TC port offset"); if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("delvolset", bc_DeleteVolSetCmd, 0, + ts = cmd_CreateSyntax("delvolset", bc_DeleteVolSetCmd, NULL, "delete a volume set"); cmd_AddParm(ts, "-name", CMD_LIST, CMD_REQUIRED, "volume set name"); if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("addvolentry", bc_AddVolEntryCmd, 0, + ts = cmd_CreateSyntax("addvolentry", bc_AddVolEntryCmd, NULL, "add a new volume entry"); cmd_AddParm(ts, "-name", CMD_SINGLE, CMD_REQUIRED, "volume set name"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "machine name"); @@ -650,26 +647,26 @@ main(argc, argv) if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("delvolentry", bc_DeleteVolEntryCmd, 0, + ts = cmd_CreateSyntax("delvolentry", bc_DeleteVolEntryCmd, NULL, "delete a volume set sub-entry"); cmd_AddParm(ts, "-name", CMD_SINGLE, CMD_REQUIRED, "volume set name"); cmd_AddParm(ts, "-entry", CMD_SINGLE, CMD_REQUIRED, "volume set index"); if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("adddump", bc_AddDumpCmd, 0, "add dump schedule"); + ts = cmd_CreateSyntax("adddump", bc_AddDumpCmd, NULL, "add dump schedule"); cmd_AddParm(ts, "-dump", CMD_LIST, CMD_REQUIRED, "dump level name"); cmd_AddParm(ts, "-expires", CMD_LIST, CMD_OPTIONAL, "expiration date"); if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("deldump", bc_DeleteDumpCmd, 0, + ts = cmd_CreateSyntax("deldump", bc_DeleteDumpCmd, NULL, "delete dump schedule"); cmd_AddParm(ts, "-dump", CMD_SINGLE, CMD_REQUIRED, "dump level name"); if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("labeltape", bc_LabelTapeCmd, 0, "label a tape"); + ts = cmd_CreateSyntax("labeltape", bc_LabelTapeCmd, NULL, "label a tape"); cmd_AddParm(ts, "-name", CMD_SINGLE, CMD_OPTIONAL, "AFS tape name, defaults to NULL"); cmd_AddParm(ts, "-size", CMD_SINGLE, CMD_OPTIONAL, @@ -681,14 +678,14 @@ main(argc, argv) if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("readlabel", bc_ReadLabelCmd, 0, + ts = cmd_CreateSyntax("readlabel", bc_ReadLabelCmd, NULL, "read the label on tape"); cmd_AddParm(ts, "-portoffset", CMD_SINGLE, CMD_OPTIONAL, "TC port offset"); if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("scantape", bc_ScanDumpsCmd, 0, + ts = cmd_CreateSyntax("scantape", bc_ScanDumpsCmd, NULL, "dump information recovery from tape"); cmd_AddParm(ts, "-dbadd", CMD_FLAG, CMD_OPTIONAL, "add information to the database"); @@ -697,34 +694,34 @@ main(argc, argv) if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("volinfo", bc_dblookupCmd, 0, + ts = cmd_CreateSyntax("volinfo", bc_dblookupCmd, NULL, "query the backup database"); cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, "volume name"); if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("setexp", bc_SetExpCmd, 0, + ts = cmd_CreateSyntax("setexp", bc_SetExpCmd, NULL, "set/clear dump expiration dates"); cmd_AddParm(ts, "-dump", CMD_LIST, CMD_REQUIRED, "dump level name"); cmd_AddParm(ts, "-expires", CMD_LIST, CMD_OPTIONAL, "expiration date"); if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("savedb", bc_saveDbCmd, 0, "save backup database"); + ts = cmd_CreateSyntax("savedb", bc_saveDbCmd, NULL, "save backup database"); cmd_AddParm(ts, "-portoffset", CMD_SINGLE, CMD_OPTIONAL, "TC port offset"); cmd_AddParm(ts, "-archive", CMD_LIST, CMD_OPTIONAL, "date time"); if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("restoredb", bc_restoreDbCmd, 0, + ts = cmd_CreateSyntax("restoredb", bc_restoreDbCmd, NULL, "restore backup database"); cmd_AddParm(ts, "-portoffset", CMD_SINGLE, CMD_OPTIONAL, "TC port offset"); if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("dumpinfo", bc_dumpInfoCmd, 0, + ts = cmd_CreateSyntax("dumpinfo", bc_dumpInfoCmd, NULL, "provide information about a dump in the database"); cmd_AddParm(ts, "-ndumps", CMD_SINGLE, CMD_OPTIONAL, "no. of dumps"); cmd_AddParm(ts, "-id", CMD_SINGLE, CMD_OPTIONAL, "dump id"); @@ -733,13 +730,13 @@ main(argc, argv) if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("dbverify", bc_dbVerifyCmd, 0, + ts = cmd_CreateSyntax("dbverify", bc_dbVerifyCmd, NULL, "check ubik database integrity"); cmd_AddParm(ts, "-detail", CMD_FLAG, CMD_OPTIONAL, "additional details"); if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("deletedump", bc_deleteDumpCmd, 0, + ts = cmd_CreateSyntax("deletedump", bc_deleteDumpCmd, NULL, "delete dumps from the database"); cmd_AddParm(ts, "-dumpid", CMD_LIST, CMD_OPTIONAL, "dump id"); cmd_AddParm(ts, "-from", CMD_LIST, CMD_OPTIONAL, "date time"); @@ -756,7 +753,7 @@ main(argc, argv) if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("interactive", bc_interactCmd, 0, + ts = cmd_CreateSyntax("interactive", bc_interactCmd, NULL, "enter interactive mode"); add_std_args(ts); diff --git a/src/bucoord/tape_hosts.c b/src/bucoord/tape_hosts.c index 631896880..73c3fd8b0 100644 --- a/src/bucoord/tape_hosts.c +++ b/src/bucoord/tape_hosts.c @@ -49,10 +49,8 @@ extern char *whoami; * Add a host to the tape hosts */ -afs_int32 -bc_AddHostCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +int +bc_AddHostCmd(struct cmd_syndesc *as, void *arock) { struct cmd_item *ti; udbClientTextP ctPtr; @@ -107,10 +105,8 @@ bc_AddHostCmd(as, arock) return (code); } -afs_int32 -bc_DeleteHostCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +int +bc_DeleteHostCmd(struct cmd_syndesc *as, void *arock) { struct cmd_item *ti; afs_int32 port = 0; @@ -174,10 +170,8 @@ bc_DeleteHostCmd(as, arock) * ignored */ -afs_int32 -bc_ListHostsCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +int +bc_ListHostsCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; register struct bc_hostEntry *tentry; diff --git a/src/bucoord/vol_sets.c b/src/bucoord/vol_sets.c index 6190d6e6e..7cf8707f0 100644 --- a/src/bucoord/vol_sets.c +++ b/src/bucoord/vol_sets.c @@ -57,11 +57,10 @@ extern void FreeVolumeSet(struct bc_volumeSet *avset); * parm 3 is volume regexp */ -bc_AddVolEntryCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +int +bc_AddVolEntryCmd(struct cmd_syndesc *as, void *arock) { - register afs_int32 code; + register int code; char *volSetName, *serverName, *partitionName, *volRegExp; udbClientTextP ctPtr; struct bc_volumeSet *tset; @@ -129,13 +128,11 @@ bc_AddVolEntryCmd(as, arock) * name of new volume set */ -afs_int32 -bc_AddVolSetCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +int +bc_AddVolSetCmd(struct cmd_syndesc *as, void *arock) { /* parm 0 is vol set name */ - register afs_int32 code; + register int code; register struct cmd_item *ti; udbClientTextP ctPtr; afs_int32 flags; @@ -190,12 +187,10 @@ bc_AddVolSetCmd(as, arock) * parm 1 is entry # (integer, 1 based) */ -afs_int32 -bc_DeleteVolEntryCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +int +bc_DeleteVolEntryCmd(struct cmd_syndesc *as, void *arock) { - register afs_int32 code; + register int code; afs_int32 entry; char *vsname; udbClientTextP ctPtr; @@ -279,13 +274,11 @@ bc_DeleteVolEntryCmd(as, arock) * name of volumeset to delete */ -afs_int32 -bc_DeleteVolSetCmd(as, arock) - struct cmd_syndesc *as; - char *arock; +int +bc_DeleteVolSetCmd(struct cmd_syndesc *as, void *arock) { /* parm 0 is vol set name */ - register afs_int32 code; + register int code; register struct cmd_item *ti; udbClientTextP ctPtr; afs_int32 c; @@ -364,13 +357,13 @@ ListVolSet(struct bc_volumeSet *aset) * optional parameter specifies a volumeset name */ -afs_int32 -bc_ListVolSetCmd(struct cmd_syndesc *as, char *arock) +int +bc_ListVolSetCmd(struct cmd_syndesc *as, void *arock) { /* parm 0 is optional volume set to display */ register struct bc_volumeSet *tset; register struct cmd_item *ti; - afs_int32 code = 0; + int code = 0; code = bc_UpdateVolumeSet(); if (code) { diff --git a/src/budb/server.c b/src/budb/server.c index 15036770d..8e6de000e 100644 --- a/src/budb/server.c +++ b/src/budb/server.c @@ -54,6 +54,8 @@ RCSID struct ubik_dbase *BU_dbase; struct afsconf_dir *BU_conf; /* for getting cell info */ +int argHandler(struct cmd_syndesc *, void *); + char lcell[MAXKTCREALMLEN]; afs_int32 myHost = 0; int helpOption; @@ -123,8 +125,7 @@ convert_cell_to_ubik(cellinfo, myHost, serverList) * If it were, this routine would never have been called. */ static int -MyBeforeProc(as) - register struct cmd_syndesc *as; +MyBeforeProc(register struct cmd_syndesc *as, void *arock) { helpOption = 0; return 0; @@ -138,8 +139,6 @@ initializeArgHandler() { struct cmd_syndesc *cptr; - int argHandler(); - cmd_SetBeforeProc(MyBeforeProc, NULL); cptr = cmd_CreateSyntax(NULL, argHandler, NULL, "Backup database server"); @@ -171,9 +170,7 @@ initializeArgHandler() } int -argHandler(as, arock) - struct cmd_syndesc *as; - char *arock; +argHandler(struct cmd_syndesc *as, void *arock) { /* globalConfPtr provides the handle for the configuration information */ diff --git a/src/butc/read_tape.c b/src/butc/read_tape.c index a99d0be23..3d0e408e7 100644 --- a/src/butc/read_tape.c +++ b/src/butc/read_tape.c @@ -382,9 +382,8 @@ writeData(data, size) return 0; } -WorkerBee(as, arock) - struct cmd_syndesc *as; - char *arock; +static int +WorkerBee(struct cmd_syndesc *as, void *arock) { char *tapedev; struct tapeLabel *label; diff --git a/src/butc/tcmain.c b/src/butc/tcmain.c index 7a6cdea0d..a65e214e6 100644 --- a/src/butc/tcmain.c +++ b/src/butc/tcmain.c @@ -830,7 +830,7 @@ GetConfigParams(char *filename, afs_int32 port) } static int -WorkerBee(struct cmd_syndesc *as, char *arock) +WorkerBee(struct cmd_syndesc *as, void *arock) { register afs_int32 code; struct rx_securityClass *(securityObjects[3]); diff --git a/src/butc/test.c b/src/butc/test.c index 236044947..3c8ef7fd5 100644 --- a/src/butc/test.c +++ b/src/butc/test.c @@ -81,9 +81,8 @@ GetServer(aname) } -static -PerformDump(as) - register struct cmd_syndesc *as; +static int +PerformDump(register struct cmd_syndesc *as, void *arock) { struct rx_connection *aconn; afs_int32 server; @@ -128,11 +127,12 @@ PerformDump(as) exit(1); } printf("dumpid returned %u\n", tdumpID); + + return 0; } -static -PerformRestore(as) - register struct cmd_syndesc *as; +static int +PerformRestore(register struct cmd_syndesc *as, void *arock) { struct rx_connection *aconn; afs_int32 server; @@ -170,11 +170,11 @@ PerformRestore(as) exit(1); } printf("dumpid returned %u\n", tdumpID); + return 0; } -static -CheckDump(as) - register struct cmd_syndesc *as; +static int +CheckDump(register struct cmd_syndesc *as, void *arock) { struct rx_connection *aconn; afs_int32 server; @@ -190,11 +190,11 @@ CheckDump(as) printf("call to TC_CheckDump failed %u\n", code); exit(1); } + return 0; } -static -AbortDump(as) - register struct cmd_syndesc *as; +static int +AbortDump(register struct cmd_syndesc *as, void *arock) { struct rx_connection *aconn; afs_int32 server; @@ -210,11 +210,11 @@ AbortDump(as) printf("call to TC_AbortDump failed %u\n", code); exit(1); } + return 0; } -static -WaitForDump(as) - register struct cmd_syndesc *as; +static int +WaitForDump(register struct cmd_syndesc *as, void *arock) { struct rx_connection *aconn; afs_int32 server; @@ -230,11 +230,11 @@ WaitForDump(as) printf("call to TC_WaitForDump failed %u\n", code); exit(1); } + return 0; } -static -EndDump(as) - register struct cmd_syndesc *as; +static int +EndDump(register struct cmd_syndesc *as, void *arock) { struct rx_connection *aconn; afs_int32 server; @@ -250,12 +250,11 @@ EndDump(as) printf("call to TC_EndDump failed %u\n", code); exit(1); } + return 0; } -static -MyBeforeProc(as, arock) - struct cmd_syndesc *as; - char *arock; +static int +MyBeforeProc(struct cmd_syndesc *as, void *arock) { afs_int32 code; @@ -296,20 +295,20 @@ main(argc, argv) #endif cmd_SetBeforeProc(MyBeforeProc, NULL); - ts = cmd_CreateSyntax("dump", PerformDump, 0, "perform a dump"); + ts = cmd_CreateSyntax("dump", PerformDump, NULL, "perform a dump"); - ts = cmd_CreateSyntax("restore", PerformRestore, 0, "perform a restore"); + ts = cmd_CreateSyntax("restore", PerformRestore, NULL, "perform a restore"); - ts = cmd_CreateSyntax("check", CheckDump, 0, "check a dump"); + ts = cmd_CreateSyntax("check", CheckDump, NULL, "check a dump"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "dump id"); - ts = cmd_CreateSyntax("abort", AbortDump, 0, "abort a dump"); + ts = cmd_CreateSyntax("abort", AbortDump, NULL, "abort a dump"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "dump id"); - ts = cmd_CreateSyntax("wait", WaitForDump, 0, "wait for a dump"); + ts = cmd_CreateSyntax("wait", WaitForDump, NULL, "wait for a dump"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "dump id"); - ts = cmd_CreateSyntax("end", EndDump, 0, "end a dump"); + ts = cmd_CreateSyntax("end", EndDump, NULL, "end a dump"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "dump id"); code = cmd_Dispatch(argc, argv); diff --git a/src/cmd/cmd.c b/src/cmd/cmd.c index 148ee4def..a56daaef5 100644 --- a/src/cmd/cmd.c +++ b/src/cmd/cmd.c @@ -30,9 +30,9 @@ struct cmd_token { static int dummy; /* non-null ptr used for flag existence */ static struct cmd_syndesc *allSyntax = 0; static int noOpcodes = 0; -static int (*beforeProc) (struct cmd_syndesc * ts, char *beforeRock) = - 0, (*afterProc) (struct cmd_syndesc * ts, char *afterRock) = 0; -static char *beforeRock, *afterRock; +static int (*beforeProc) (struct cmd_syndesc * ts, void *beforeRock) = NULL; +static int (*afterProc) (struct cmd_syndesc * ts, void *afterRock) = NULL; +static void *beforeRock, *afterRock; static char initcmd_opcode[] = "initcmd"; /*Name of initcmd opcode */ /* take name and string, and return null string if name is empty, otherwise return @@ -168,7 +168,7 @@ PrintParmHelp(register struct cmd_parmdesc *aparm) extern char *AFSVersion; static int -VersionProc(register struct cmd_syndesc *as, char *arock) +VersionProc(register struct cmd_syndesc *as, void *arock) { printf("%s\n", AFSVersion); return 0; @@ -272,7 +272,7 @@ PrintFlagHelp(register struct cmd_syndesc *as) } static int -AproposProc(register struct cmd_syndesc *as, char *arock) +AproposProc(register struct cmd_syndesc *as, void *arock) { register struct cmd_syndesc *ts; char *tsub; @@ -297,7 +297,7 @@ AproposProc(register struct cmd_syndesc *as, char *arock) } static int -HelpProc(register struct cmd_syndesc *as, char *arock) +HelpProc(register struct cmd_syndesc *as, void *arock) { register struct cmd_syndesc *ts; register struct cmd_item *ti; @@ -344,8 +344,8 @@ HelpProc(register struct cmd_syndesc *as, char *arock) } int -cmd_SetBeforeProc(int (*aproc) (struct cmd_syndesc * ts, char *beforeRock), - char *arock) +cmd_SetBeforeProc(int (*aproc) (struct cmd_syndesc * ts, void *beforeRock), + void *arock) { beforeProc = aproc; beforeRock = arock; @@ -353,8 +353,8 @@ cmd_SetBeforeProc(int (*aproc) (struct cmd_syndesc * ts, char *beforeRock), } int -cmd_SetAfterProc(int (*aproc) (struct cmd_syndesc * ts, char *afterRock), - char *arock) +cmd_SetAfterProc(int (*aproc) (struct cmd_syndesc * ts, void *afterRock), + void *arock) { afterProc = aproc; afterRock = arock; @@ -380,8 +380,8 @@ SortSyntax(struct cmd_syndesc *as) struct cmd_syndesc * cmd_CreateSyntax(char *aname, - int (*aproc) (struct cmd_syndesc * ts, char *arock), - char *arock, char *ahelp) + int (*aproc) (struct cmd_syndesc * ts, void *arock), + void *arock, char *ahelp) { register struct cmd_syndesc *td; @@ -481,7 +481,7 @@ cmd_AddParm(register struct cmd_syndesc *as, char *aname, int atype, strcpy(tp->name, aname); tp->type = atype; tp->flags = aflags; - tp->items = (struct cmd_item *)0; + tp->items = NULL; if (ahelp) { tp->help = (char *)malloc(strlen(ahelp) + 1); assert(tp->help); @@ -556,7 +556,7 @@ ResetSyntax(register struct cmd_syndesc *as) default: break; } - tp->items = (struct cmd_item *)0; + tp->items = NULL; } } diff --git a/src/cmd/cmd.p.h b/src/cmd/cmd.p.h index d8500321a..fc143ff84 100644 --- a/src/cmd/cmd.p.h +++ b/src/cmd/cmd.p.h @@ -51,8 +51,8 @@ struct cmd_syndesc { char *name; /* subcommand name */ char *a0name; /* command name from argv[0] */ char *help; /* help description */ - int (*proc) (struct cmd_syndesc * ts, char *arock); - char *rock; + int (*proc) (struct cmd_syndesc * ts, void *arock); + void *rock; int nParms; /* number of parms */ afs_int32 flags; /* random flags */ struct cmd_parmdesc parms[CMD_MAXPARMS]; /* parms themselves */ @@ -60,14 +60,14 @@ struct cmd_syndesc { extern struct cmd_syndesc *cmd_CreateSyntax(char *namep, int (*aprocp) (struct cmd_syndesc - * ts, char *arock), - char *rockp, char *helpp); + * ts, void *arock), + void *rockp, char *helpp); extern int - cmd_SetBeforeProc(int (*aproc) (struct cmd_syndesc * ts, char *beforeRock), - char *arock); + cmd_SetBeforeProc(int (*aproc) (struct cmd_syndesc * ts, void *beforeRock), + void *arock); extern int - cmd_SetAfterProc(int (*aproc) (struct cmd_syndesc * ts, char *afterRock), - char *arock); + cmd_SetAfterProc(int (*aproc) (struct cmd_syndesc * ts, void *afterRock), + void *arock); extern int cmd_CreateAlias(struct cmd_syndesc *as, char *aname); extern int cmd_Seek(struct cmd_syndesc *as, int apos); extern int cmd_AddParm(struct cmd_syndesc *as, char *aname, int atype, diff --git a/src/cmd/test/ctest.c b/src/cmd/test/ctest.c index 93c86d567..4d1bcbb83 100644 --- a/src/cmd/test/ctest.c +++ b/src/cmd/test/ctest.c @@ -16,19 +16,15 @@ RCSID #include "cmd.h" #include -static -cproc1(as, arock) - char *arock; - struct cmd_syndesc *as; +static int +cproc1(struct cmd_syndesc *as, void *arock) { printf("in the apple command\n"); return 0; } -static -cproc2(as, arock) - char *arock; - struct cmd_syndesc *as; +static int +cproc2(struct cmd_syndesc *as, void *arock) { register struct cmd_item *ti; printf("in the pear command\n"); @@ -43,9 +39,8 @@ cproc2(as, arock) return 0; } -main(argc, argv) - int argc; - char **argv; +int +main(int argc, char **argv) { register struct cmd_syndesc *ts; diff --git a/src/cmd/test/dtest.c b/src/cmd/test/dtest.c index 96d42eaab..f9577a292 100644 --- a/src/cmd/test/dtest.c +++ b/src/cmd/test/dtest.c @@ -16,10 +16,8 @@ RCSID #include "cmd.h" #include -static -cproc(as, arock) - char *arock; - struct cmd_syndesc *as; +static int +cproc(struct cmd_syndesc *as, void *arock) { register struct cmd_item *ti; printf("in the pear command\n"); @@ -32,9 +30,8 @@ cproc(as, arock) return 0; } -main(argc, argv) - int argc; - char **argv; +int +main(int argc, char **argv) { register struct cmd_syndesc *ts; diff --git a/src/cmd/test/itest.c b/src/cmd/test/itest.c index 9f7f59867..f6060e1cd 100644 --- a/src/cmd/test/itest.c +++ b/src/cmd/test/itest.c @@ -17,19 +17,15 @@ RCSID #include #include -static -cproc1(as, arock) - char *arock; - struct cmd_syndesc *as; +static int +cproc1(struct cmd_syndesc *as, void *arock) { printf("in the apple command\n"); return 0; } -static -cproc2(as, arock) - char *arock; - struct cmd_syndesc *as; +static int +cproc2(struct cmd_syndesc *as, void *arock) { register struct cmd_item *ti; printf("in the pear command\n"); @@ -44,17 +40,14 @@ cproc2(as, arock) return 0; } -static void -cproc3(as, arock) - char *arock; - struct cmd_syndesc *as; +static int +cproc3(struct cmd_syndesc *as, void *arock) { exit(0); } -main(argc, argv) - int argc; - char **argv; +int +main(int argc, char **argv) { register struct cmd_syndesc *ts; char tline[1000]; diff --git a/src/gtx/object_test.c b/src/gtx/object_test.c index 405d1fbc6..4c03b834e 100644 --- a/src/gtx/object_test.c +++ b/src/gtx/object_test.c @@ -386,10 +386,7 @@ test_objects(pkg) *------------------------------------------------------------------------*/ static int -object_testInit(as, arock) - struct cmd_syndesc *as; - char *arock; - +object_testInit(struct cmd_syndesc *as, void *arock) { /*object_testInit */ static char rn[] = "object_testInit"; /*Routine name */ @@ -442,7 +439,7 @@ main(argc, argv) /* * Set up the commands we understand. */ - ts = cmd_CreateSyntax("initcmd", object_testInit, 0, + ts = cmd_CreateSyntax("initcmd", object_testInit, NULL, "Initialize the program"); cmd_AddParm(ts, "-package", CMD_SINGLE, CMD_REQUIRED, "Graphics package to use"); diff --git a/src/gtx/screen_test.c b/src/gtx/screen_test.c index 5247bf2cb..c9e39ba0c 100644 --- a/src/gtx/screen_test.c +++ b/src/gtx/screen_test.c @@ -224,10 +224,7 @@ test_this_package(pkg) *--------------------------------------------------------------------------------*/ static int -screen_testInit(as, arock) - struct cmd_syndesc *as; - char *arock; - +screen_testInit(struct cmd_syndesc *as, void *arock) { /*screen_testInit */ static char rn[] = "screen_testInit"; /*Routine name */ @@ -280,7 +277,7 @@ main(argc, argv) * There really aren't any opcodes here, but we do want to interpret switches * from the command line. So, all we need do is set up the initcmd ``opcode''. */ - ts = cmd_CreateSyntax("initcmd", screen_testInit, 0, + ts = cmd_CreateSyntax("initcmd", screen_testInit, NULL, "Initialize, interpret command line"); cmd_AddParm(ts, "-package", CMD_SINGLE, CMD_REQUIRED, "Graphics package to use"); diff --git a/src/kauth/admin_tools.c b/src/kauth/admin_tools.c index c62cf12a5..6fe44d96c 100644 --- a/src/kauth/admin_tools.c +++ b/src/kauth/admin_tools.c @@ -234,7 +234,7 @@ DumpUser(char *user, char *arock, int showadmin, int showkey, char *inst) } int -ListUsers(struct cmd_syndesc *as, char *arock) +ListUsers(struct cmd_syndesc *as, void *arock) { struct kaident name; afs_int32 index; @@ -273,7 +273,7 @@ ListUsers(struct cmd_syndesc *as, char *arock) int -ExamineUser(struct cmd_syndesc *as, char *arock) +ExamineUser(struct cmd_syndesc *as, void *arock) { int showkey = (as->parms[1].items != NULL); return DumpUser(as->parms[0].items->data, arock, 0, showkey, NULL); @@ -318,7 +318,7 @@ handle_errors(int code, /* error code to handle */ } int -CreateUser(struct cmd_syndesc *as, char *arock) +CreateUser(struct cmd_syndesc *as, void *arock) { int code; char name[MAXKTCNAMELEN]; @@ -348,7 +348,7 @@ CreateUser(struct cmd_syndesc *as, char *arock) } int -DeleteUser(struct cmd_syndesc *as, char *arock) +DeleteUser(struct cmd_syndesc *as, void *arock) { int code; char name[MAXKTCNAMELEN]; @@ -532,7 +532,7 @@ ka_islocked(char *name, char *instance, afs_uint32 * when) } int -Unlock(struct cmd_syndesc *as, char *arock) +Unlock(struct cmd_syndesc *as, void *arock) { afs_int32 code, rcode = 0; afs_int32 count; @@ -573,7 +573,7 @@ Unlock(struct cmd_syndesc *as, char *arock) } int -SetFields(struct cmd_syndesc *as, char *arock) +SetFields(struct cmd_syndesc *as, void *arock) { int code; char name[MAXKTCNAMELEN]; @@ -735,7 +735,7 @@ SetFields(struct cmd_syndesc *as, char *arock) } int -StringToKey(struct cmd_syndesc *as, char *arock) +StringToKey(struct cmd_syndesc *as, void *arock) { afs_int32 code; char realm[MAXKTCREALMLEN]; @@ -772,7 +772,7 @@ StringToKey(struct cmd_syndesc *as, char *arock) } int -SetPassword(struct cmd_syndesc *as, char *arock) +SetPassword(struct cmd_syndesc *as, void *arock) { int code; char name[MAXKTCNAMELEN]; @@ -964,7 +964,7 @@ ListTicket(struct ktc_principal *server, int verbose) } static -GetTicket(struct cmd_syndesc *as, char *arock) +GetTicket(struct cmd_syndesc *as, void *arock) { int code; struct ktc_principal server; @@ -1010,7 +1010,7 @@ GetTicket(struct cmd_syndesc *as, char *arock) } static -GetPassword(struct cmd_syndesc *as, char *arock) +GetPassword(struct cmd_syndesc *as, void *arock) { int code; char name[MAXKTCNAMELEN]; @@ -1062,7 +1062,7 @@ GetPassword(struct cmd_syndesc *as, char *arock) } int -GetRandomKey(struct cmd_syndesc *as, char *arock) +GetRandomKey(struct cmd_syndesc *as, void *arock) { int code; struct ktc_encryptionKey key; @@ -1088,7 +1088,7 @@ GetRandomKey(struct cmd_syndesc *as, char *arock) } int -Statistics(struct cmd_syndesc *as, char *arock) +Statistics(struct cmd_syndesc *as, void *arock) { int code; kasstats statics; @@ -1141,7 +1141,7 @@ Statistics(struct cmd_syndesc *as, char *arock) } int -DebugInfo(struct cmd_syndesc *as, char *arock) +DebugInfo(struct cmd_syndesc *as, void *arock) { int code; struct ka_debugInfo info; @@ -1237,21 +1237,21 @@ DebugInfo(struct cmd_syndesc *as, char *arock) } int -Interactive(struct cmd_syndesc *as, char *arock) +Interactive(struct cmd_syndesc *as, void *arock) { finished = 0; return 0; } int -Quit(struct cmd_syndesc *as, char *arock) +Quit(struct cmd_syndesc *as, void *arock) { finished = 1; return 0; } int -MyAfterProc(struct cmd_syndesc *as) +MyAfterProc(struct cmd_syndesc *as, void *arock) { if (!strcmp(as->name, "help")) return 0; @@ -1274,14 +1274,14 @@ char newCell[MAXKTCREALMLEN]; afs_int32 serverList[MAXSERVERS]; int -NoAuth(struct cmd_syndesc *as, char *arock) +NoAuth(struct cmd_syndesc *as, void *arock) { noauth = 1; return 0; } static int -MyBeforeProc(struct cmd_syndesc *as, char *arock) +MyBeforeProc(struct cmd_syndesc *as, void *arock) { extern struct passwd *getpwuid(); struct ktc_encryptionKey key; @@ -1539,7 +1539,7 @@ MyBeforeProc(struct cmd_syndesc *as, char *arock) /* These are some helpful command that deal with the cache managers tokens. */ static -ForgetTicket(struct cmd_syndesc *as, char *arock) +ForgetTicket(struct cmd_syndesc *as, void *arock) { afs_int32 code; @@ -1593,7 +1593,7 @@ ForgetTicket(struct cmd_syndesc *as, char *arock) } static -ListTickets(struct cmd_syndesc *as, char *arock) +ListTickets(struct cmd_syndesc *as, void *arock) { afs_int32 code = 0; int index, newIndex; @@ -1666,14 +1666,15 @@ ka_AdminInteractive(int cmd_argc, char *cmd_argv[]) cmd_SetBeforeProc(MyBeforeProc, NULL); cmd_SetAfterProc(MyAfterProc, NULL); - ts = cmd_CreateSyntax("interactive", Interactive, 0, + ts = cmd_CreateSyntax("interactive", Interactive, NULL, "enter interactive mode"); add_std_args(ts); - ts = cmd_CreateSyntax("noauthentication", NoAuth, 0, + ts = cmd_CreateSyntax("noauthentication", NoAuth, NULL, "connect to AuthServer w/o using token"); - ts = cmd_CreateSyntax("list", ListUsers, 0, "list all users in database"); + ts = cmd_CreateSyntax("list", ListUsers, NULL, + "list all users in database"); cmd_AddParm(ts, "-long", CMD_FLAG, CMD_OPTIONAL, "show detailed info about each user"); cmd_AddParm(ts, "-showadmin", CMD_FLAG, CMD_OPTIONAL, @@ -1683,26 +1684,26 @@ ka_AdminInteractive(int cmd_argc, char *cmd_argv[]) add_std_args(ts); cmd_CreateAlias(ts, "ls"); - ts = cmd_CreateSyntax("examine", ExamineUser, 0, + ts = cmd_CreateSyntax("examine", ExamineUser, NULL, "examine the entry for a user"); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "name of user"); cmd_AddParm(ts, "-showkey", CMD_FLAG, CMD_OPTIONAL, "show the user's actual key rather than the checksum"); add_std_args(ts); - ts = cmd_CreateSyntax("create", CreateUser, 0, + ts = cmd_CreateSyntax("create", CreateUser, NULL, "create an entry for a user"); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "name of user"); cmd_AddParm(ts, "-initial_password", CMD_SINGLE, CMD_OPTIONAL, "initial password"); add_std_args(ts); - ts = cmd_CreateSyntax("delete", DeleteUser, 0, "delete a user"); + ts = cmd_CreateSyntax("delete", DeleteUser, NULL, "delete a user"); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "name of user"); add_std_args(ts); cmd_CreateAlias(ts, "rm"); - ts = cmd_CreateSyntax("setfields", SetFields, 0, + ts = cmd_CreateSyntax("setfields", SetFields, NULL, "set various fields in a user's entry"); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "name of user"); cmd_AddParm(ts, "-flags", CMD_SINGLE, CMD_OPTIONAL, @@ -1727,18 +1728,18 @@ ka_AdminInteractive(int cmd_argc, char *cmd_argv[]) cmd_CreateAlias(ts, "sf"); - ts = cmd_CreateSyntax("unlock", Unlock, 0, + ts = cmd_CreateSyntax("unlock", Unlock, NULL, "Enable authentication ID after max failed attempts exceeded"); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "authentication ID"); add_std_args(ts); - ts = cmd_CreateSyntax("stringtokey", StringToKey, 0, + ts = cmd_CreateSyntax("stringtokey", StringToKey, NULL, "convert a string to a key"); cmd_AddParm(ts, "-string", CMD_SINGLE, 0, "password string"); cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cell name"); - ts = cmd_CreateSyntax("setpassword", SetPassword, 0, + ts = cmd_CreateSyntax("setpassword", SetPassword, NULL, "set a user's password"); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "name of user"); cmd_AddParm(ts, "-new_password", CMD_SINGLE, CMD_OPTIONAL, @@ -1752,7 +1753,7 @@ ka_AdminInteractive(int cmd_argc, char *cmd_argv[]) #endif /* set a user's key */ - ts = cmd_CreateSyntax("setkey", SetPassword, 0, (char *)CMD_HIDDEN); + ts = cmd_CreateSyntax("setkey", SetPassword, NULL, (char *)CMD_HIDDEN); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "name of user"); cmd_Seek(ts, 2); cmd_AddParm(ts, "-new_key", CMD_SINGLE, 0, "eight byte new key"); @@ -1761,7 +1762,7 @@ ka_AdminInteractive(int cmd_argc, char *cmd_argv[]) add_std_args(ts); /* get a user's password */ - ts = cmd_CreateSyntax("getpassword", GetPassword, 0, (char *)CMD_HIDDEN); + ts = cmd_CreateSyntax("getpassword", GetPassword, NULL, (char *)CMD_HIDDEN); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "name of user"); /* don't take standard args */ /* add_std_args (ts); */ @@ -1770,27 +1771,27 @@ ka_AdminInteractive(int cmd_argc, char *cmd_argv[]) #endif /* get a random key */ - ts = cmd_CreateSyntax("getrandomkey", GetRandomKey, 0, + ts = cmd_CreateSyntax("getrandomkey", GetRandomKey, NULL, (char *)CMD_HIDDEN); add_std_args(ts); /* get a ticket for a specific server */ - ts = cmd_CreateSyntax("getticket", GetTicket, 0, (char *)CMD_HIDDEN); + ts = cmd_CreateSyntax("getticket", GetTicket, NULL, (char *)CMD_HIDDEN); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "name of server"); cmd_AddParm(ts, "-lifetime", CMD_SINGLE, CMD_OPTIONAL, "ticket lifetime"); add_std_args(ts); - ts = cmd_CreateSyntax("statistics", Statistics, 0, + ts = cmd_CreateSyntax("statistics", Statistics, NULL, "show statistics for AuthServer"); add_std_args(ts); /* show debugging info from AuthServer */ - ts = cmd_CreateSyntax("debuginfo", DebugInfo, 0, (char *)CMD_HIDDEN); + ts = cmd_CreateSyntax("debuginfo", DebugInfo, NULL, (char *)CMD_HIDDEN); cmd_AddParm(ts, "-hostname", CMD_SINGLE, CMD_OPTIONAL, "authentication server host name"); add_std_args(ts); - ts = cmd_CreateSyntax("forgetticket", ForgetTicket, 0, + ts = cmd_CreateSyntax("forgetticket", ForgetTicket, NULL, "delete user's tickets"); #ifdef notdef cmd_AddParm(ts, "-name", CMD_SINGLE, (CMD_OPTIONAL | CMD_HIDE), @@ -1798,13 +1799,13 @@ ka_AdminInteractive(int cmd_argc, char *cmd_argv[]) #endif cmd_AddParm(ts, "-all", CMD_FLAG, CMD_OPTIONAL, "delete all tickets"); - ts = cmd_CreateSyntax("listtickets", ListTickets, 0, + ts = cmd_CreateSyntax("listtickets", ListTickets, NULL, "show all cache manager tickets"); cmd_AddParm(ts, "-name", CMD_SINGLE, CMD_OPTIONAL, "name of server"); cmd_AddParm(ts, "-long", CMD_FLAG, CMD_OPTIONAL, "show session key and ticket"); - ts = cmd_CreateSyntax("quit", Quit, 0, "exit program"); + ts = cmd_CreateSyntax("quit", Quit, NULL, "exit program"); finished = 1; conn = 0; /* no connection yet */ diff --git a/src/kauth/kdb.c b/src/kauth/kdb.c index de5aab4cd..7b1edebbb 100644 --- a/src/kauth/kdb.c +++ b/src/kauth/kdb.c @@ -29,8 +29,8 @@ RCSID char *dbmfile; -static -cmdproc(register struct cmd_syndesc *as, afs_int32 arock) +static int +cmdproc(register struct cmd_syndesc *as, void * arock) { DBM *kdb; datum key, data; @@ -96,6 +96,7 @@ cmdproc(register struct cmd_syndesc *as, afs_int32 arock) } } dbm_close(kdb); + return 0; } @@ -111,7 +112,7 @@ main(int argc, char **argv) sprintf(dbmfile_help, "dbmfile to use (default %s)", AFSDIR_SERVER_KALOGDB_FILEPATH); dbmfile = AFSDIR_SERVER_KALOGDB_FILEPATH; - ts = cmd_CreateSyntax(NULL, cmdproc, 0, "Dump contents of dbm database"); + ts = cmd_CreateSyntax(NULL, cmdproc, NULL, "Dump contents of dbm database"); cmd_AddParm(ts, "-dbmfile", CMD_SINGLE, CMD_OPTIONAL, dbmfile_help); cmd_AddParm(ts, "-key", CMD_SINGLE, CMD_OPTIONAL, "extract entries that match specified key"); diff --git a/src/kauth/klog.c b/src/kauth/klog.c index c9ab643ef..29397574d 100644 --- a/src/kauth/klog.c +++ b/src/kauth/klog.c @@ -64,7 +64,7 @@ RCSID #define KLOGEXIT(code) assert(!code || code >= KAMINERROR); \ rx_Finalize(); \ (!code ? exit(0) : exit((code)-KAMINERROR+1)) -extern int CommandProc(struct cmd_syndesc *as, char *arock); +int CommandProc(struct cmd_syndesc *as, void *arock); static int zero_argc; static char **zero_argv; @@ -98,7 +98,7 @@ main(int argc, char *argv[]) zero_argc = argc; zero_argv = argv; - ts = cmd_CreateSyntax(NULL, CommandProc, 0, + ts = cmd_CreateSyntax(NULL, CommandProc, NULL, "obtain Kerberos authentication"); #define aXFLAG 0 @@ -151,7 +151,7 @@ getpipepass(void) } int -CommandProc(struct cmd_syndesc *as, char *arock) +CommandProc(struct cmd_syndesc *as, void *arock) { char name[MAXKTCNAMELEN]; char instance[MAXKTCNAMELEN]; diff --git a/src/kauth/knfs.c b/src/kauth/knfs.c index 6f4a9823a..24a9b829d 100644 --- a/src/kauth/knfs.c +++ b/src/kauth/knfs.c @@ -33,9 +33,6 @@ RCSID #include #include - -extern struct cmd_syndesc *cmd_CreateSyntax(); - /* Modifications: @@ -352,10 +349,8 @@ NFSCopyToken(ahost, auid) return code; } -static -cmdproc(as, arock) - register struct cmd_syndesc *as; - afs_int32 arock; +static int +cmdproc(register struct cmd_syndesc *as, void *arock) { register struct hostent *the; char *tp, *sysname = 0; @@ -463,7 +458,7 @@ main(argc, argv) sigaction(SIGSEGV, &nsa, NULL); #endif - ts = cmd_CreateSyntax(NULL, cmdproc, 0, "copy tickets for NFS"); + ts = cmd_CreateSyntax(NULL, cmdproc, NULL, "copy tickets for NFS"); cmd_AddParm(ts, "-host", CMD_SINGLE, CMD_REQUIRED, "host name"); cmd_AddParm(ts, "-id", CMD_SINGLE, CMD_OPTIONAL, "user ID (decimal)"); cmd_AddParm(ts, "-sysname", CMD_SINGLE, CMD_OPTIONAL, diff --git a/src/kauth/kpasswd.c b/src/kauth/kpasswd.c index f1d3d5478..eaaf9a0d0 100644 --- a/src/kauth/kpasswd.c +++ b/src/kauth/kpasswd.c @@ -73,7 +73,7 @@ RCSID /* The following code to make use of libcmd.a also stolen from klog.c. */ -int CommandProc(); +int CommandProc(struct cmd_syndesc *, void *); static int zero_argc; static char **zero_argv; @@ -201,9 +201,7 @@ timedout() #endif char passwd[BUFSIZ], npasswd[BUFSIZ], verify[BUFSIZ]; -CommandProc(as, arock) - char *arock; - struct cmd_syndesc *as; +CommandProc(struct cmd_syndesc *as, void *arock) { char name[MAXKTCNAMELEN] = ""; char instance[MAXKTCNAMELEN] = ""; diff --git a/src/kauth/manyklog.c b/src/kauth/manyklog.c index fbc906c86..0dd7a367a 100644 --- a/src/kauth/manyklog.c +++ b/src/kauth/manyklog.c @@ -63,7 +63,7 @@ RCSID #define KLOGEXIT(code) assert(!code || code >= KAMINERROR); \ rx_Finalize(); \ (!code ? exit(0) : exit((code)-KAMINERROR+1)) -int CommandProc(); +static int CommandProc(struct cmd_syndesc *, void *); static int zero_argc; static char **zero_argv; @@ -97,7 +97,7 @@ main(argc, argv) zero_argc = argc; zero_argv = argv; - ts = cmd_CreateSyntax(NULL, CommandProc, 0, + ts = cmd_CreateSyntax(NULL, CommandProc, NULL, "obtain Kerberos authentication"); #define aXFLAG 0 @@ -152,9 +152,8 @@ getpipepass() return gpbuf; } -CommandProc(as, arock) - char *arock; - struct cmd_syndesc *as; +static int +CommandProc(struct cmd_syndesc *as, void *arock) { char name[MAXKTCNAMELEN]; char instance[MAXKTCNAMELEN]; diff --git a/src/kauth/rebuild.c b/src/kauth/rebuild.c index 606f33b74..2d097aea5 100644 --- a/src/kauth/rebuild.c +++ b/src/kauth/rebuild.c @@ -397,9 +397,8 @@ readDB(offset, buffer, size) #include "AFS_component_version_number.c" -WorkerBee(as, arock) - struct cmd_syndesc *as; - char *arock; +static int +WorkerBee(struct cmd_syndesc *as, void *arock) { afs_int32 code; char *dbFile; diff --git a/src/kauth/test/multiklog.c b/src/kauth/test/multiklog.c index cf9149e92..cfa9b9fa4 100644 --- a/src/kauth/test/multiklog.c +++ b/src/kauth/test/multiklog.c @@ -53,7 +53,7 @@ RCSID -repeat is the number of times to iterate over the authentication */ -int CommandProc(); +static int CommandProc(struct cmd_syndesc *, void *); static int zero_argc; static char **zero_argv; @@ -76,7 +76,7 @@ main(argc, argv) zero_argc = argc; zero_argv = argv; - ts = cmd_CreateSyntax(NULL, CommandProc, 0, + ts = cmd_CreateSyntax(NULL, CommandProc, NULL, "obtain Kerberos authentication"); #define aXFLAG 0 @@ -129,9 +129,8 @@ getpipepass() return gpbuf; } -CommandProc(as, arock) - char *arock; - struct cmd_syndesc *as; +static int +CommandProc(struct cmd_syndesc *as, void *arock) { char name[MAXKTCNAMELEN]; char instance[MAXKTCNAMELEN]; diff --git a/src/kauth/test/test_getticket.c b/src/kauth/test/test_getticket.c index a11b86cd0..b2bcdbcec 100644 --- a/src/kauth/test/test_getticket.c +++ b/src/kauth/test/test_getticket.c @@ -207,12 +207,10 @@ GetTokenLife(name, passwd, expectedLife, match) CheckLife(t.endTime, t.startTime, expectedLife, match); } -static long -Main(as, arock) - IN struct cmd_syndesc *as; - IN char *arock; +static int +Main(struct cmd_syndesc *as, void *arock) { - long code; + int code; char name[MAXKTCNAMELEN]; char instance[MAXKTCNAMELEN]; char newCell[MAXKTCREALMLEN]; @@ -510,7 +508,7 @@ main(argc, argv) initialize_ACFG_error_table(); initialize_KA_error_table(); - ts = cmd_CreateSyntax(0, Main, 0, "Main program"); + ts = cmd_CreateSyntax(NULL, Main, NULL, "Main program"); /* 0 */ cmd_AddParm(ts, "-patient", CMD_FLAG, CMD_OPTIONAL, "wait for TGS ticket to age"); cmd_Seek(ts, 12); diff --git a/src/kauth/test/test_rxkad_free.c b/src/kauth/test/test_rxkad_free.c index ffbc590ab..5d4159b5e 100644 --- a/src/kauth/test/test_rxkad_free.c +++ b/src/kauth/test/test_rxkad_free.c @@ -52,12 +52,10 @@ PrintRxkadStats() rxkad_stats.destroyUnauth); } -static long -Main(as, arock) - IN struct cmd_syndesc *as; - IN char *arock; +static int +Main(struct cmd_syndesc *as, void *arock) { - long code; + int code; char name[MAXKTCNAMELEN]; char instance[MAXKTCNAMELEN]; char newCell[MAXKTCREALMLEN]; @@ -373,7 +371,7 @@ main(argc, argv) initialize_ACFG_error_table(); initialize_KA_error_table(); - ts = cmd_CreateSyntax(0, Main, 0, "Main program"); + ts = cmd_CreateSyntax(NULL, Main, NULL, "Main program"); /* 0 */ cmd_AddParm(ts, "-number", CMD_SINGLE, CMD_OPTIONAL, "number of iterations"); /* 1 */ cmd_AddParm(ts, "-long", CMD_FLAG, CMD_OPTIONAL, diff --git a/src/libadmin/cfg/test/cfgtest.c b/src/libadmin/cfg/test/cfgtest.c index 670c73f0d..3416e8006 100644 --- a/src/libadmin/cfg/test/cfgtest.c +++ b/src/libadmin/cfg/test/cfgtest.c @@ -90,7 +90,7 @@ CellServDbCallBack(void *callBackId, cfg_cellServDbStatus_t * statusItemP, static int -DoCellServDbAddHost(struct cmd_syndesc *as, char *arock) +DoCellServDbAddHost(struct cmd_syndesc *as, void *arock) { afs_status_t st = 0; int maxUpdates; @@ -135,7 +135,7 @@ DoCellServDbAddHost(struct cmd_syndesc *as, char *arock) static int -DoCellServDbRemoveHost(struct cmd_syndesc *as, char *arock) +DoCellServDbRemoveHost(struct cmd_syndesc *as, void *arock) { afs_status_t st = 0; int maxUpdates; @@ -181,7 +181,7 @@ DoCellServDbRemoveHost(struct cmd_syndesc *as, char *arock) static int -DoCellServDbEnumerate(struct cmd_syndesc *as, char *arock) +DoCellServDbEnumerate(struct cmd_syndesc *as, void *arock) { afs_status_t st = 0; char *fsDbHost = as->parms[0].items->data; @@ -216,21 +216,21 @@ SetupCellServDbCmd(void) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax("CellServDbAddHost", DoCellServDbAddHost, 0, + ts = cmd_CreateSyntax("CellServDbAddHost", DoCellServDbAddHost, NULL, "add configuration target to server CellServDB"); cmd_AddParm(ts, "-cfghost", CMD_SINGLE, CMD_REQUIRED, "configuration host"); cmd_AddParm(ts, "-syshost", CMD_SINGLE, CMD_OPTIONAL, "system control host"); - ts = cmd_CreateSyntax("CellServDbRemoveHost", DoCellServDbRemoveHost, 0, + ts = cmd_CreateSyntax("CellServDbRemoveHost", DoCellServDbRemoveHost, NULL, "remove configuration target from server CellServDB"); cmd_AddParm(ts, "-cfghost", CMD_SINGLE, CMD_REQUIRED, "configuration host"); cmd_AddParm(ts, "-syshost", CMD_SINGLE, CMD_OPTIONAL, "system control host"); - ts = cmd_CreateSyntax("CellServDbEnumerate", DoCellServDbEnumerate, 0, + ts = cmd_CreateSyntax("CellServDbEnumerate", DoCellServDbEnumerate, NULL, "enumerate server CellServDB from specified host"); cmd_AddParm(ts, "-host", CMD_SINGLE, CMD_REQUIRED, "host name"); @@ -245,7 +245,7 @@ SetupCellServDbCmd(void) static int -DoDbServersWaitForQuorum(struct cmd_syndesc *as, char *arock) +DoDbServersWaitForQuorum(struct cmd_syndesc *as, void *arock) { afs_status_t st = 0; void *hostHandle; @@ -273,7 +273,7 @@ DoDbServersWaitForQuorum(struct cmd_syndesc *as, char *arock) static int -DoFileServerStop(struct cmd_syndesc *as, char *arock) +DoFileServerStop(struct cmd_syndesc *as, void *arock) { afs_status_t st = 0; void *hostHandle; @@ -294,7 +294,7 @@ DoFileServerStop(struct cmd_syndesc *as, char *arock) } static int -DoFileServerStart(struct cmd_syndesc *as, char *arock) +DoFileServerStart(struct cmd_syndesc *as, void *arock) { afs_status_t st = 0; void *hostHandle; @@ -321,18 +321,18 @@ SetupServerCmd(void) struct cmd_syndesc *ts; ts = cmd_CreateSyntax("DbServersWaitForQuorum", DoDbServersWaitForQuorum, - 0, "wait for database servers to achieve quorum"); + NULL, "wait for database servers to achieve quorum"); cmd_AddParm(ts, "-cfghost", CMD_SINGLE, CMD_REQUIRED, "configuration host"); cmd_AddParm(ts, "-timeout", CMD_SINGLE, CMD_OPTIONAL, "timeout in seconds"); - ts = cmd_CreateSyntax("FileServerStop", DoFileServerStop, 0, + ts = cmd_CreateSyntax("FileServerStop", DoFileServerStop, NULL, "stop and unconfigure fileserver on specified host"); cmd_AddParm(ts, "-cfghost", CMD_SINGLE, CMD_REQUIRED, "configuration host"); - ts = cmd_CreateSyntax("FileServerStart", DoFileServerStart, 0, + ts = cmd_CreateSyntax("FileServerStart", DoFileServerStart, NULL, "start the fileserver on specified host"); cmd_AddParm(ts, "-cfghost", CMD_SINGLE, CMD_REQUIRED, "configuration host"); @@ -344,7 +344,7 @@ SetupServerCmd(void) static int -DoHostPartitionTableEnumerate(struct cmd_syndesc *as, char *arock) +DoHostPartitionTableEnumerate(struct cmd_syndesc *as, void *arock) { afs_status_t st = 0; cfg_partitionEntry_t *vptable; @@ -385,7 +385,7 @@ SetupHostCmd(void) struct cmd_syndesc *ts; ts = cmd_CreateSyntax("HostPartitionTableEnumerate", - DoHostPartitionTableEnumerate, 0, + DoHostPartitionTableEnumerate, NULL, "enumerate vice partition table"); cmd_AddParm(ts, "-cfghost", CMD_SINGLE, CMD_REQUIRED, "configuration host"); @@ -398,7 +398,7 @@ SetupHostCmd(void) static int -DoClientCellServDbAdd(struct cmd_syndesc *as, char *arock) +DoClientCellServDbAdd(struct cmd_syndesc *as, void *arock) { afs_status_t st = 0; void *hostHandle; @@ -422,7 +422,7 @@ DoClientCellServDbAdd(struct cmd_syndesc *as, char *arock) static int -DoClientCellServDbRemove(struct cmd_syndesc *as, char *arock) +DoClientCellServDbRemove(struct cmd_syndesc *as, void *arock) { afs_status_t st = 0; void *hostHandle; @@ -447,7 +447,7 @@ DoClientCellServDbRemove(struct cmd_syndesc *as, char *arock) static int -DoClientStart(struct cmd_syndesc *as, char *arock) +DoClientStart(struct cmd_syndesc *as, void *arock) { afs_status_t st = 0; void *hostHandle; @@ -474,7 +474,7 @@ DoClientStart(struct cmd_syndesc *as, char *arock) static int -DoClientStop(struct cmd_syndesc *as, char *arock) +DoClientStop(struct cmd_syndesc *as, void *arock) { afs_status_t st = 0; void *hostHandle; @@ -501,7 +501,7 @@ DoClientStop(struct cmd_syndesc *as, char *arock) static int -DoClientSetCell(struct cmd_syndesc *as, char *arock) +DoClientSetCell(struct cmd_syndesc *as, void *arock) { afs_status_t st = 0; void *hostHandle; @@ -544,7 +544,7 @@ DoClientSetCell(struct cmd_syndesc *as, char *arock) static int -DoClientQueryStatus(struct cmd_syndesc *as, char *arock) +DoClientQueryStatus(struct cmd_syndesc *as, void *arock) { afs_status_t st = 0; char *cfgHost = as->parms[0].items->data; @@ -578,7 +578,7 @@ DoClientQueryStatus(struct cmd_syndesc *as, char *arock) static int -DoHostQueryStatus(struct cmd_syndesc *as, char *arock) +DoHostQueryStatus(struct cmd_syndesc *as, void *arock) { afs_status_t st = 0; char *cfgHost = as->parms[0].items->data; @@ -610,7 +610,7 @@ SetupClientCmd(void) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax("ClientCellServDbAdd", DoClientCellServDbAdd, 0, + ts = cmd_CreateSyntax("ClientCellServDbAdd", DoClientCellServDbAdd, NULL, "add host entry to client CellServDB"); cmd_AddParm(ts, "-cfghost", CMD_SINGLE, CMD_REQUIRED, "configuration host"); @@ -618,38 +618,38 @@ SetupClientCmd(void) cmd_AddParm(ts, "-dbhost", CMD_SINGLE, CMD_REQUIRED, "host to add"); ts = cmd_CreateSyntax("ClientCellServDbRemove", DoClientCellServDbRemove, - 0, "remove host entry from client CellServDB"); + NULL, "remove host entry from client CellServDB"); cmd_AddParm(ts, "-cfghost", CMD_SINGLE, CMD_REQUIRED, "configuration host"); cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_REQUIRED, "cell name"); cmd_AddParm(ts, "-dbhost", CMD_SINGLE, CMD_REQUIRED, "host to remove"); - ts = cmd_CreateSyntax("ClientSetCell", DoClientSetCell, 0, + ts = cmd_CreateSyntax("ClientSetCell", DoClientSetCell, NULL, "set default client cell"); cmd_AddParm(ts, "-cfghost", CMD_SINGLE, CMD_REQUIRED, "configuration host"); cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_REQUIRED, "cell name"); cmd_AddParm(ts, "-dbhosts", CMD_LIST, CMD_REQUIRED, "database hosts"); - ts = cmd_CreateSyntax("ClientQueryStatus", DoClientQueryStatus, 0, + ts = cmd_CreateSyntax("ClientQueryStatus", DoClientQueryStatus, NULL, "query status of client on host"); cmd_AddParm(ts, "-cfghost", CMD_SINGLE, CMD_REQUIRED, "configuration host"); - ts = cmd_CreateSyntax("HostQueryStatus", DoHostQueryStatus, 0, + ts = cmd_CreateSyntax("HostQueryStatus", DoHostQueryStatus, NULL, "query status of server on host"); cmd_AddParm(ts, "-cfghost", CMD_SINGLE, CMD_REQUIRED, "configuration host"); - ts = cmd_CreateSyntax("ClientStart", DoClientStart, 0, + ts = cmd_CreateSyntax("ClientStart", DoClientStart, NULL, "start the client"); cmd_AddParm(ts, "-cfghost", CMD_SINGLE, CMD_REQUIRED, "configuration host"); cmd_AddParm(ts, "-timeout", CMD_SINGLE, CMD_REQUIRED, "wait timeout"); - ts = cmd_CreateSyntax("ClientStop", DoClientStop, 0, "stop the client"); + ts = cmd_CreateSyntax("ClientStop", DoClientStop, NULL, "stop the client"); cmd_AddParm(ts, "-cfghost", CMD_SINGLE, CMD_REQUIRED, "configuration host"); cmd_AddParm(ts, "-timeout", CMD_SINGLE, CMD_REQUIRED, "wait timeout"); diff --git a/src/libadmin/test/afscp.c b/src/libadmin/test/afscp.c index 48259b671..af0fb22a8 100644 --- a/src/libadmin/test/afscp.c +++ b/src/libadmin/test/afscp.c @@ -59,7 +59,7 @@ pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER; */ static int -MyBeforeProc(struct cmd_syndesc *as, char *arock) +MyBeforeProc(struct cmd_syndesc *as, void *arock) { afs_status_t st = 0; int no_auth = 0; @@ -149,7 +149,7 @@ MyBeforeProc(struct cmd_syndesc *as, char *arock) } static int -MyAfterProc(struct cmd_syndesc *as) +MyAfterProc(struct cmd_syndesc *as,void *arock) { afsclient_CellClose(cellHandle, (afs_status_p) 0); diff --git a/src/libadmin/test/bos.c b/src/libadmin/test/bos.c index ec7b95ab2..bc85cc932 100644 --- a/src/libadmin/test/bos.c +++ b/src/libadmin/test/bos.c @@ -268,7 +268,7 @@ ktime_ParsePeriodic(char *adate, bos_RestartTime_p ak) } int -DoBosProcessCreate(struct cmd_syndesc *as, char *arock) +DoBosProcessCreate(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PROCESS, BINARY, CRON, CRONTIME, NOTIFIER @@ -334,7 +334,7 @@ DoBosProcessCreate(struct cmd_syndesc *as, char *arock) } int -DoBosFSProcessCreate(struct cmd_syndesc *as, char *arock) +DoBosFSProcessCreate(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PROCESS, FILESERVER, VOLSERVER, SALVAGER, NOTIFIER @@ -386,7 +386,7 @@ DoBosFSProcessCreate(struct cmd_syndesc *as, char *arock) } int -DoBosProcessDelete(struct cmd_syndesc *as, char *arock) +DoBosProcessDelete(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PROCESS } DoBosProcessDelete_parm_t; afs_status_t st = 0; @@ -435,7 +435,7 @@ Print_bos_ProcessExecutionState_p(bos_ProcessExecutionState_p state, } int -DoBosProcessExecutionStateGet(struct cmd_syndesc *as, char *arock) +DoBosProcessExecutionStateGet(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PROCESS } DoBosProcessExecutionStateGet_parm_t; afs_status_t st = 0; @@ -471,7 +471,7 @@ DoBosProcessExecutionStateGet(struct cmd_syndesc *as, char *arock) } int -DoBosProcessExecutionStateSet(struct cmd_syndesc *as, char *arock) +DoBosProcessExecutionStateSet(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PROCESS, STOPPED, RUNNING @@ -522,7 +522,7 @@ DoBosProcessExecutionStateSet(struct cmd_syndesc *as, char *arock) } int -DoBosProcessExecutionStateSetTemporary(struct cmd_syndesc *as, char *arock) +DoBosProcessExecutionStateSetTemporary(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PROCESS, STOPPED, RUNNING @@ -574,7 +574,7 @@ DoBosProcessExecutionStateSetTemporary(struct cmd_syndesc *as, char *arock) } int -DoBosProcessNameList(struct cmd_syndesc *as, char *arock) +DoBosProcessNameList(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER } DoBosProcessNameList_parm_t; afs_status_t st = 0; @@ -663,7 +663,7 @@ Print_bos_ProcessInfo_p(bos_ProcessInfo_p info, const char *prefix) } int -DoBosProcessInfoGet(struct cmd_syndesc *as, char *arock) +DoBosProcessInfoGet(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PROCESS } DoBosProcessInfoGet_parm_t; afs_status_t st = 0; @@ -694,7 +694,7 @@ DoBosProcessInfoGet(struct cmd_syndesc *as, char *arock) } int -DoBosProcessParameterList(struct cmd_syndesc *as, char *arock) +DoBosProcessParameterList(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PROCESS } DoBosProcessParameterList_parm_t; afs_status_t st = 0; @@ -738,7 +738,7 @@ DoBosProcessParameterList(struct cmd_syndesc *as, char *arock) } int -DoBosProcessNotifierGet(struct cmd_syndesc *as, char *arock) +DoBosProcessNotifierGet(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PROCESS } DoBosProcessNotifierGet_parm_t; afs_status_t st = 0; @@ -773,7 +773,7 @@ DoBosProcessNotifierGet(struct cmd_syndesc *as, char *arock) } int -DoBosProcessRestart(struct cmd_syndesc *as, char *arock) +DoBosProcessRestart(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PROCESS } DoBosProcessRestart_parm_t; afs_status_t st = 0; @@ -801,7 +801,7 @@ DoBosProcessRestart(struct cmd_syndesc *as, char *arock) } int -DoBosProcessAllStop(struct cmd_syndesc *as, char *arock) +DoBosProcessAllStop(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER } DoBosProcessAllStop_parm_t; afs_status_t st = 0; @@ -824,7 +824,7 @@ DoBosProcessAllStop(struct cmd_syndesc *as, char *arock) } int -DoBosProcessAllStart(struct cmd_syndesc *as, char *arock) +DoBosProcessAllStart(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER } DoBosProcessAllStart_parm_t; afs_status_t st = 0; @@ -847,7 +847,7 @@ DoBosProcessAllStart(struct cmd_syndesc *as, char *arock) } int -DoBosProcessAllWaitStop(struct cmd_syndesc *as, char *arock) +DoBosProcessAllWaitStop(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER } DoBosProcessAllWaitStop_parm_t; afs_status_t st = 0; @@ -870,7 +870,7 @@ DoBosProcessAllWaitStop(struct cmd_syndesc *as, char *arock) } int -DoBosProcessAllWaitTransition(struct cmd_syndesc *as, char *arock) +DoBosProcessAllWaitTransition(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER } DoBosProcessAllWaitTransition_parm_t; afs_status_t st = 0; @@ -893,7 +893,7 @@ DoBosProcessAllWaitTransition(struct cmd_syndesc *as, char *arock) } int -DoBosProcessAllStopAndRestart(struct cmd_syndesc *as, char *arock) +DoBosProcessAllStopAndRestart(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, INCLUDEBOS } DoBosProcessAllStopAndRestart_parm_t; afs_status_t st = 0; @@ -921,7 +921,7 @@ DoBosProcessAllStopAndRestart(struct cmd_syndesc *as, char *arock) } int -DoBosAdminCreate(struct cmd_syndesc *as, char *arock) +DoBosAdminCreate(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, ADMIN } DoBosAdminCreate_parm_t; afs_status_t st = 0; @@ -949,7 +949,7 @@ DoBosAdminCreate(struct cmd_syndesc *as, char *arock) } int -DoBosAdminDelete(struct cmd_syndesc *as, char *arock) +DoBosAdminDelete(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, ADMIN } DoBosAdminDelete_parm_t; afs_status_t st = 0; @@ -977,7 +977,7 @@ DoBosAdminDelete(struct cmd_syndesc *as, char *arock) } int -DoBosAdminList(struct cmd_syndesc *as, char *arock) +DoBosAdminList(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER } DoBosAdminList_parm_t; afs_status_t st = 0; @@ -1016,7 +1016,7 @@ DoBosAdminList(struct cmd_syndesc *as, char *arock) } int -DoBosKeyCreate(struct cmd_syndesc *as, char *arock) +DoBosKeyCreate(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, VERSIONNUMBER, KEY } DoBosKeyCreate_parm_t; afs_status_t st = 0; @@ -1058,7 +1058,7 @@ DoBosKeyCreate(struct cmd_syndesc *as, char *arock) } int -DoBosKeyDelete(struct cmd_syndesc *as, char *arock) +DoBosKeyDelete(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, VERSIONNUMBER } DoBosKeyDelete_parm_t; afs_status_t st = 0; @@ -1106,7 +1106,7 @@ Print_bos_KeyInfo_p(bos_KeyInfo_p key, const char *prefix) } int -DoBosKeyList(struct cmd_syndesc *as, char *arock) +DoBosKeyList(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER } DoBosKeyList_parm_t; afs_status_t st = 0; @@ -1145,7 +1145,7 @@ DoBosKeyList(struct cmd_syndesc *as, char *arock) } int -DoBosCellSet(struct cmd_syndesc *as, char *arock) +DoBosCellSet(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, CELL } DoBosCellSet_parm_t; afs_status_t st = 0; @@ -1173,7 +1173,7 @@ DoBosCellSet(struct cmd_syndesc *as, char *arock) } int -DoBosCellGet(struct cmd_syndesc *as, char *arock) +DoBosCellGet(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER } DoBosCellGet_parm_t; afs_status_t st = 0; @@ -1199,7 +1199,7 @@ DoBosCellGet(struct cmd_syndesc *as, char *arock) } int -DoBosHostCreate(struct cmd_syndesc *as, char *arock) +DoBosHostCreate(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, HOST } DoBosHostCreate_parm_t; afs_status_t st = 0; @@ -1227,7 +1227,7 @@ DoBosHostCreate(struct cmd_syndesc *as, char *arock) } int -DoBosHostDelete(struct cmd_syndesc *as, char *arock) +DoBosHostDelete(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, HOST } DoBosHostDelete_parm_t; afs_status_t st = 0; @@ -1255,7 +1255,7 @@ DoBosHostDelete(struct cmd_syndesc *as, char *arock) } int -DoBosHostList(struct cmd_syndesc *as, char *arock) +DoBosHostList(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER } DoBosHostList_parm_t; afs_status_t st = 0; @@ -1294,7 +1294,7 @@ DoBosHostList(struct cmd_syndesc *as, char *arock) } int -DoBosExecutableCreate(struct cmd_syndesc *as, char *arock) +DoBosExecutableCreate(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, BINARY, DEST } DoBosExecutableCreate_parm_t; afs_status_t st = 0; @@ -1327,7 +1327,7 @@ DoBosExecutableCreate(struct cmd_syndesc *as, char *arock) } int -DoBosExecutableRevert(struct cmd_syndesc *as, char *arock) +DoBosExecutableRevert(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, EXECUTABLE } DoBosExecutableRevert_parm_t; afs_status_t st = 0; @@ -1355,7 +1355,7 @@ DoBosExecutableRevert(struct cmd_syndesc *as, char *arock) } int -DoBosExecutableTimestampGet(struct cmd_syndesc *as, char *arock) +DoBosExecutableTimestampGet(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, EXECUTABLE } DoBosExecutableTimestampGet_parm_t; afs_status_t st = 0; @@ -1387,7 +1387,7 @@ DoBosExecutableTimestampGet(struct cmd_syndesc *as, char *arock) } int -DoBosExecutablePrune(struct cmd_syndesc *as, char *arock) +DoBosExecutablePrune(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, OLDFILES, BAKFILES, COREFILES @@ -1428,7 +1428,7 @@ DoBosExecutablePrune(struct cmd_syndesc *as, char *arock) } int -DoBosExecutableRestartTimeSet(struct cmd_syndesc *as, char *arock) +DoBosExecutableRestartTimeSet(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, DAILY, WEEKLY, TIME @@ -1527,7 +1527,7 @@ Print_bos_RestartTime_p(bos_RestartTime_p restart, const char *prefix) } int -DoBosExecutableRestartTimeGet(struct cmd_syndesc *as, char *arock) +DoBosExecutableRestartTimeGet(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, DAILY, WEEKLY @@ -1578,7 +1578,7 @@ DoBosExecutableRestartTimeGet(struct cmd_syndesc *as, char *arock) #define INITIAL_BUF_SIZE 4096 int -DoBosLogGet(struct cmd_syndesc *as, char *arock) +DoBosLogGet(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, LOGFILE } DoBosLogGet_parm_t; afs_status_t st = 0; @@ -1626,7 +1626,7 @@ DoBosLogGet(struct cmd_syndesc *as, char *arock) } int -DoBosAuthSet(struct cmd_syndesc *as, char *arock) +DoBosAuthSet(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, REQUIREAUTH, DISABLEAUTH } DoBosAuthSet_parm_t; afs_status_t st = 0; @@ -1670,7 +1670,7 @@ DoBosAuthSet(struct cmd_syndesc *as, char *arock) } int -DoBosCommandExecute(struct cmd_syndesc *as, char *arock) +DoBosCommandExecute(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, COMMAND } DoBosCommandExecute_parm_t; afs_status_t st = 0; @@ -1698,7 +1698,7 @@ DoBosCommandExecute(struct cmd_syndesc *as, char *arock) } int -DoBosSalvage(struct cmd_syndesc *as, char *arock) +DoBosSalvage(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PARTITION, VOLUME, NUMSALVAGERS, TMPDIR, LOGFILE, FORCE, NOWRITE, INODES, ROOTINODES, SALVAGEDIRS, BLOCKREADS @@ -1802,7 +1802,7 @@ SetupBosAdminCmd(void) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax("BosProcessCreate", DoBosProcessCreate, 0, + ts = cmd_CreateSyntax("BosProcessCreate", DoBosProcessCreate, NULL, "create a new bos process"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where process will be created"); @@ -1818,7 +1818,7 @@ SetupBosAdminCmd(void) "path to notifier binary that is run when process terminates"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosFSProcessCreate", DoBosFSProcessCreate, 0, + ts = cmd_CreateSyntax("BosFSProcessCreate", DoBosFSProcessCreate, NULL, "create a fs bos process"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where process will be created"); @@ -1834,7 +1834,7 @@ SetupBosAdminCmd(void) "path to notifier binary that is run when process terminates"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosProcessDelete", DoBosProcessDelete, 0, + ts = cmd_CreateSyntax("BosProcessDelete", DoBosProcessDelete, NULL, "delete a bos process"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where process will be deleted"); @@ -1843,7 +1843,7 @@ SetupBosAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("BosProcessExecutionStateGet", - DoBosProcessExecutionStateGet, 0, + DoBosProcessExecutionStateGet, NULL, "get the process execution state of a process"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where process exists"); @@ -1852,7 +1852,7 @@ SetupBosAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("BosProcessExecutionStateSet", - DoBosProcessExecutionStateSet, 0, + DoBosProcessExecutionStateSet, NULL, "set the process execution state of a process"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where process exists"); @@ -1865,7 +1865,7 @@ SetupBosAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("BosProcessExecutionStateSetTemporary", - DoBosProcessExecutionStateSetTemporary, 0, + DoBosProcessExecutionStateSetTemporary, NULL, "set the process execution state " "of a process temporarily"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, @@ -1878,12 +1878,12 @@ SetupBosAdminCmd(void) "set the process state to running"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosProcessNameList", DoBosProcessNameList, 0, + ts = cmd_CreateSyntax("BosProcessNameList", DoBosProcessNameList, NULL, "list the names of all processes at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosProcessInfoGet", DoBosProcessInfoGet, 0, + ts = cmd_CreateSyntax("BosProcessInfoGet", DoBosProcessInfoGet, NULL, "get information about a process"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where process exists"); @@ -1892,7 +1892,7 @@ SetupBosAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("BosProcessParameterList", - DoBosProcessParameterList, 0, + DoBosProcessParameterList, NULL, "list the parameters of a process"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where process exists"); @@ -1900,7 +1900,7 @@ SetupBosAdminCmd(void) "the name of the process"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosProcessNotifierGet", DoBosProcessNotifierGet, 0, + ts = cmd_CreateSyntax("BosProcessNotifierGet", DoBosProcessNotifierGet, NULL, "get the notifier for a process"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where process exists"); @@ -1908,7 +1908,7 @@ SetupBosAdminCmd(void) "the name of the process"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosProcessRestart", DoBosProcessRestart, 0, + ts = cmd_CreateSyntax("BosProcessRestart", DoBosProcessRestart, NULL, "restart a process"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where process exists"); @@ -1916,13 +1916,13 @@ SetupBosAdminCmd(void) "the name of the process"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosProcessAllStop", DoBosProcessAllStop, 0, + ts = cmd_CreateSyntax("BosProcessAllStop", DoBosProcessAllStop, NULL, "stop all processes at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where processes exists"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosProcessAllWaitStop", DoBosProcessAllWaitStop, 0, + ts = cmd_CreateSyntax("BosProcessAllWaitStop", DoBosProcessAllWaitStop, NULL, "stop all processes at a bos server and block " "until they all exit"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, @@ -1930,7 +1930,7 @@ SetupBosAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("BosProcessAllWaitTransition", - DoBosProcessAllWaitTransition, 0, + DoBosProcessAllWaitTransition, NULL, "wait until all processes have transitioned to " "their desired state"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, @@ -1938,7 +1938,7 @@ SetupBosAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("BosProcessAllStopAndRestart", - DoBosProcessAllStopAndRestart, 0, + DoBosProcessAllStopAndRestart, NULL, "stop all processes at a bos server and " "then restart them"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, @@ -1947,7 +1947,7 @@ SetupBosAdminCmd(void) "include the bos server in the processes to be restarted"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosAdminCreate", DoBosAdminCreate, 0, + ts = cmd_CreateSyntax("BosAdminCreate", DoBosAdminCreate, NULL, "create an admin user at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where admin will be created"); @@ -1955,7 +1955,7 @@ SetupBosAdminCmd(void) "the name of the administrator to add"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosAdminDelete", DoBosAdminDelete, 0, + ts = cmd_CreateSyntax("BosAdminDelete", DoBosAdminDelete, NULL, "delete an admin user at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where admin will be deleted"); @@ -1963,13 +1963,13 @@ SetupBosAdminCmd(void) "the name of the administrator to delete"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosAdminList", DoBosAdminList, 0, + ts = cmd_CreateSyntax("BosAdminList", DoBosAdminList, NULL, "list all admin users at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where admins will be listed"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosKeyCreate", DoBosKeyCreate, 0, + ts = cmd_CreateSyntax("BosKeyCreate", DoBosKeyCreate, NULL, "create a key at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where key will be created"); @@ -1978,7 +1978,7 @@ SetupBosAdminCmd(void) cmd_AddParm(ts, "-key", CMD_SINGLE, CMD_REQUIRED, "new encryption key"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosKeyDelete", DoBosKeyDelete, 0, + ts = cmd_CreateSyntax("BosKeyDelete", DoBosKeyDelete, NULL, "delete a key at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where key will be deleted"); @@ -1986,41 +1986,41 @@ SetupBosAdminCmd(void) "version number of the key"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosKeyList", DoBosKeyList, 0, + ts = cmd_CreateSyntax("BosKeyList", DoBosKeyList, NULL, "list keys at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where keys exist"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosCellSet", DoBosCellSet, 0, + ts = cmd_CreateSyntax("BosCellSet", DoBosCellSet, NULL, "set the cell at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to modify"); cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_REQUIRED, "new cell"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosCellGet", DoBosCellGet, 0, + ts = cmd_CreateSyntax("BosCellGet", DoBosCellGet, NULL, "get the cell at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosHostCreate", DoBosHostCreate, 0, + ts = cmd_CreateSyntax("BosHostCreate", DoBosHostCreate, NULL, "add a host entry to the server CellServDB"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to modify"); cmd_AddParm(ts, "-host", CMD_SINGLE, CMD_REQUIRED, "host to add"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosHostDelete", DoBosHostDelete, 0, + ts = cmd_CreateSyntax("BosHostDelete", DoBosHostDelete, NULL, "delete a host entry from the server CellServDB"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to modify"); cmd_AddParm(ts, "-host", CMD_SINGLE, CMD_REQUIRED, "host to delete"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosHostList", DoBosHostList, 0, + ts = cmd_CreateSyntax("BosHostList", DoBosHostList, NULL, "list all host entries from the server CellServDB"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosExecutableCreate", DoBosExecutableCreate, 0, + ts = cmd_CreateSyntax("BosExecutableCreate", DoBosExecutableCreate, NULL, "create a new binary at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to modify"); cmd_AddParm(ts, "-binary", CMD_SINGLE, CMD_REQUIRED, @@ -2029,7 +2029,7 @@ SetupBosAdminCmd(void) "path where the binary will be stored"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosExecutableRevert", DoBosExecutableRevert, 0, + ts = cmd_CreateSyntax("BosExecutableRevert", DoBosExecutableRevert, NULL, "revert a binary at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to modify"); cmd_AddParm(ts, "-executable", CMD_SINGLE, CMD_REQUIRED, @@ -2037,14 +2037,14 @@ SetupBosAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("BosExecutableTimestampGet", - DoBosExecutableTimestampGet, 0, + DoBosExecutableTimestampGet, NULL, "get the timestamps for a binary at bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to query"); cmd_AddParm(ts, "-executable", CMD_SINGLE, CMD_REQUIRED, "path to the binary to revert"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosExecutablePrune", DoBosExecutablePrune, 0, + ts = cmd_CreateSyntax("BosExecutablePrune", DoBosExecutablePrune, NULL, "prune various files at bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to modify"); cmd_AddParm(ts, "-oldfiles", CMD_FLAG, CMD_OPTIONAL, "prune .old files"); @@ -2053,7 +2053,7 @@ SetupBosAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("BosExecutableRestartTimeSet", - DoBosExecutableRestartTimeSet, 0, + DoBosExecutableRestartTimeSet, NULL, "set the restart times at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to modify"); cmd_AddParm(ts, "-daily", CMD_FLAG, CMD_OPTIONAL, @@ -2065,7 +2065,7 @@ SetupBosAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("BosExecutableRestartTimeGet", - DoBosExecutableRestartTimeGet, 0, + DoBosExecutableRestartTimeGet, NULL, "get the restart times at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to query"); cmd_AddParm(ts, "-daily", CMD_FLAG, CMD_OPTIONAL, @@ -2074,14 +2074,14 @@ SetupBosAdminCmd(void) "get weekly restart time"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosLogGet", DoBosLogGet, 0, + ts = cmd_CreateSyntax("BosLogGet", DoBosLogGet, NULL, "get a log file from the bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to query"); cmd_AddParm(ts, "-logfile", CMD_SINGLE, CMD_REQUIRED, "path to the log file to retrieve"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosAuthSet", DoBosAuthSet, 0, + ts = cmd_CreateSyntax("BosAuthSet", DoBosAuthSet, NULL, "set the authorization level at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to modify"); cmd_AddParm(ts, "-requireauth", CMD_FLAG, CMD_OPTIONAL, @@ -2098,7 +2098,7 @@ SetupBosAdminCmd(void) "command to execute"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosSalvage", DoBosSalvage, 0, + ts = cmd_CreateSyntax("BosSalvage", DoBosSalvage, NULL, "execute a salvage command at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where salvager will execute"); diff --git a/src/libadmin/test/client.c b/src/libadmin/test/client.c index 8b18ba02c..c4fd4d43b 100644 --- a/src/libadmin/test/client.c +++ b/src/libadmin/test/client.c @@ -262,7 +262,7 @@ interface_t int_list[] = { */ int -DoClientLocalCellGet(struct cmd_syndesc *as, char *arock) +DoClientLocalCellGet(struct cmd_syndesc *as, void *arock) { afs_status_t st = 0; char cellName[MAXCELLCHARS]; @@ -277,7 +277,7 @@ DoClientLocalCellGet(struct cmd_syndesc *as, char *arock) } int -DoClientMountPointCreate(struct cmd_syndesc *as, char *arock) +DoClientMountPointCreate(struct cmd_syndesc *as, void *arock) { typedef enum { DIRECTORY, VOLUME, READWRITE, CHECK @@ -331,7 +331,7 @@ Print_afs_serverEntry_p(afs_serverEntry_p serv, const char *prefix) } int -DoClientAFSServerGet(struct cmd_syndesc *as, char *arock) +DoClientAFSServerGet(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER } DoClientAFSServerGet_parm_t; afs_status_t st = 0; @@ -352,7 +352,7 @@ DoClientAFSServerGet(struct cmd_syndesc *as, char *arock) } int -DoClientAFSServerList(struct cmd_syndesc *as, char *arock) +DoClientAFSServerList(struct cmd_syndesc *as, void *arock) { afs_status_t st = 0; afs_serverEntry_t entry; @@ -476,7 +476,7 @@ GetStatTypeFromString(const char *type) } int -DoClientRPCStatsStateGet(struct cmd_syndesc *as, char *arock) +DoClientRPCStatsStateGet(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PROCESS, STAT_TYPE @@ -536,7 +536,7 @@ DoClientRPCStatsStateGet(struct cmd_syndesc *as, char *arock) } int -DoClientRPCStatsStateEnable(struct cmd_syndesc *as, char *arock) +DoClientRPCStatsStateEnable(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PROCESS, STAT_TYPE } DoClientRPCStatsEnable_parm_t; afs_status_t st = 0; @@ -590,7 +590,7 @@ DoClientRPCStatsStateEnable(struct cmd_syndesc *as, char *arock) } int -DoClientRPCStatsStateDisable(struct cmd_syndesc *as, char *arock) +DoClientRPCStatsStateDisable(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PROCESS, STAT_TYPE @@ -694,7 +694,7 @@ Print_afs_RPCStats_p(afs_RPCStats_p stat, interface_function_list_p f_list, } int -DoClientRPCStatsList(struct cmd_syndesc *as, char *arock) +DoClientRPCStatsList(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PROCESS, STAT_TYPE } DoClientRPCStatsList_parm_t; afs_status_t st = 0; @@ -819,7 +819,7 @@ DoClientRPCStatsList(struct cmd_syndesc *as, char *arock) } int -DoClientRPCStatsClear(struct cmd_syndesc *as, char *arock) +DoClientRPCStatsClear(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PROCESS, STAT_TYPE, CLEAR_ALL, CLEAR_INVOCATIONS, CLEAR_BYTES_SENT, CLEAR_BYTES_RCVD, @@ -991,7 +991,7 @@ DoClientRPCStatsClear(struct cmd_syndesc *as, char *arock) } int -DoClientRPCStatsVersionGet(struct cmd_syndesc *as, char *arock) +DoClientRPCStatsVersionGet(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PROCESS } DoClientRPCStatsVersionGet_parm_t; afs_status_t st = 0; @@ -1047,7 +1047,7 @@ Print_afs_CMServerPref_p(afs_CMServerPref_p pref) } int -DoClientCMGetServerPrefs(struct cmd_syndesc *as, char *arock) +DoClientCMGetServerPrefs(struct cmd_syndesc *as, void *arock) { afs_status_t st = 0; typedef enum { SERVER, PORT } DoClientCMGetServerPrefs_parm_t; @@ -1117,7 +1117,7 @@ Print_afs_CMListCell_p(afs_CMListCell_p cellInfo) } int -DoClientCMListCells(struct cmd_syndesc *as, char *arock) +DoClientCMListCells(struct cmd_syndesc *as, void *arock) { afs_status_t st = 0; typedef enum { SERVER, PORT } DoClientCMListCells_parm_t; @@ -1172,7 +1172,7 @@ DoClientCMListCells(struct cmd_syndesc *as, char *arock) } int -DoClientCMLocalCell(struct cmd_syndesc *as, char *arock) +DoClientCMLocalCell(struct cmd_syndesc *as, void *arock) { afs_status_t st = 0; typedef enum { SERVER, PORT } DoClientCMLocalCell_parm_t; @@ -1231,7 +1231,7 @@ Print_afs_ClientConfig_p(afs_ClientConfig_p config) } int -DoClientCMClientConfig(struct cmd_syndesc *as, char *arock) +DoClientCMClientConfig(struct cmd_syndesc *as, void *arock) { afs_status_t st = 0; typedef enum { SERVER, PORT } DoClientCMLocalCell_parm_t; @@ -1280,12 +1280,12 @@ SetupClientAdminCmd(void) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax("ClientLocalCellGet", DoClientLocalCellGet, 0, + ts = cmd_CreateSyntax("ClientLocalCellGet", DoClientLocalCellGet, NULL, "get the name of this machine's cell"); SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("ClientMountPointCreate", DoClientMountPointCreate, - 0, "create a mount point"); + NULL, "create a mount point"); cmd_AddParm(ts, "-directory", CMD_SINGLE, CMD_REQUIRED, "directory where mount point will be created"); cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, @@ -1296,12 +1296,12 @@ SetupClientAdminCmd(void) "check that the volume exists before mounting"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("ClientAFSServerGet", DoClientAFSServerGet, 0, + ts = cmd_CreateSyntax("ClientAFSServerGet", DoClientAFSServerGet, NULL, "retrieve information about an afs server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("ClientAFSServerList", DoClientAFSServerList, 0, + ts = cmd_CreateSyntax("ClientAFSServerList", DoClientAFSServerList, NULL, "retrieve information about all afs " "servers in a cell"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, @@ -1314,7 +1314,7 @@ SetupClientAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("ClientRPCStatsStateGet", DoClientRPCStatsStateGet, - 0, "retrieve the rpc stat collection state"); + NULL, "retrieve the rpc stat collection state"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where command will execute"); cmd_AddParm(ts, "-process", CMD_SINGLE, CMD_REQUIRED, @@ -1325,7 +1325,7 @@ SetupClientAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("ClientRPCStatsStateEnable", - DoClientRPCStatsStateEnable, 0, + DoClientRPCStatsStateEnable, NULL, "set the rpc stat collection state to on"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where command will execute"); @@ -1337,7 +1337,7 @@ SetupClientAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("ClientRPCStatsStateDisable", - DoClientRPCStatsStateDisable, 0, + DoClientRPCStatsStateDisable, NULL, "set the rpc stat collection state to off"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where command will execute"); @@ -1348,7 +1348,7 @@ SetupClientAdminCmd(void) "stats to retrieve "); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("ClientRPCStatsList", DoClientRPCStatsList, 0, + ts = cmd_CreateSyntax("ClientRPCStatsList", DoClientRPCStatsList, NULL, "list the rpc stats"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where command will execute"); @@ -1359,7 +1359,7 @@ SetupClientAdminCmd(void) "stats to retrieve "); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("ClientRPCStatsClear", DoClientRPCStatsClear, 0, + ts = cmd_CreateSyntax("ClientRPCStatsClear", DoClientRPCStatsClear, NULL, "reset rpc stat counters"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where command will execute"); @@ -1395,7 +1395,7 @@ SetupClientAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("ClientRPCStatsVersionGet", - DoClientRPCStatsVersionGet, 0, + DoClientRPCStatsVersionGet, NULL, "list the server's rpc stats version"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where command will execute"); @@ -1405,27 +1405,27 @@ SetupClientAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("ClientCMGetServerPrefs", DoClientCMGetServerPrefs, - 0, "list a client's server preferences "); + NULL, "list a client's server preferences "); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where command will execute"); cmd_AddParm(ts, "-port", CMD_SINGLE, CMD_OPTIONAL, "UDP port to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("ClientCMListCells", DoClientCMListCells, 0, + ts = cmd_CreateSyntax("ClientCMListCells", DoClientCMListCells, NULL, "list a client's CellServDB "); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where command will execute"); cmd_AddParm(ts, "-port", CMD_SINGLE, CMD_OPTIONAL, "UDP port to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("ClientCMLocalCell", DoClientCMLocalCell, 0, + ts = cmd_CreateSyntax("ClientCMLocalCell", DoClientCMLocalCell, NULL, "get the name of the client's local cell"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where command will execute"); cmd_AddParm(ts, "-port", CMD_SINGLE, CMD_OPTIONAL, "UDP port to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("ClientCMClientConfig", DoClientCMClientConfig, 0, + ts = cmd_CreateSyntax("ClientCMClientConfig", DoClientCMClientConfig, NULL, "get the client's cache configuration"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where command will execute"); diff --git a/src/libadmin/test/kas.c b/src/libadmin/test/kas.c index 4de8be6aa..a2d3dc513 100644 --- a/src/libadmin/test/kas.c +++ b/src/libadmin/test/kas.c @@ -45,7 +45,7 @@ GetIntFromString(const char *int_str, const char *error_msg) } int -DoKasPrincipalCreate(struct cmd_syndesc *as, char *arock) +DoKasPrincipalCreate(struct cmd_syndesc *as, void *arock) { typedef enum { PRINCIPAL, INSTANCE, PASSWORD @@ -73,7 +73,7 @@ DoKasPrincipalCreate(struct cmd_syndesc *as, char *arock) } int -DoKasPrincipalDelete(struct cmd_syndesc *as, char *arock) +DoKasPrincipalDelete(struct cmd_syndesc *as, void *arock) { typedef enum { PRINCIPAL, INSTANCE } DoKasPrincipalGet_parm_t; afs_status_t st = 0; @@ -160,7 +160,7 @@ Print_kas_principalEntry_p(kas_principalEntry_p principal, const char *prefix) } int -DoKasPrincipalGet(struct cmd_syndesc *as, char *arock) +DoKasPrincipalGet(struct cmd_syndesc *as, void *arock) { typedef enum { PRINCIPAL, INSTANCE } DoKasPrincipalGet_parm_t; afs_status_t st = 0; @@ -186,7 +186,7 @@ DoKasPrincipalGet(struct cmd_syndesc *as, char *arock) } int -DoKasPrincipalList(struct cmd_syndesc *as, char *arock) +DoKasPrincipalList(struct cmd_syndesc *as, void *arock) { afs_status_t st = 0; void *iter; @@ -218,7 +218,7 @@ DoKasPrincipalList(struct cmd_syndesc *as, char *arock) } int -DoKasPrincipalKeySet(struct cmd_syndesc *as, char *arock) +DoKasPrincipalKeySet(struct cmd_syndesc *as, void *arock) { typedef enum { PRINCIPAL, INSTANCE, PASSWORD, KEYVERSION @@ -258,7 +258,7 @@ DoKasPrincipalKeySet(struct cmd_syndesc *as, char *arock) } int -DoKasPrincipalLockStatusGet(struct cmd_syndesc *as, char *arock) +DoKasPrincipalLockStatusGet(struct cmd_syndesc *as, void *arock) { typedef enum { PRINCIPAL, INSTANCE } DoKasPrincipalLockStatusGet_parm_t; afs_status_t st = 0; @@ -284,7 +284,7 @@ DoKasPrincipalLockStatusGet(struct cmd_syndesc *as, char *arock) } int -DoKasPrincipalUnlock(struct cmd_syndesc *as, char *arock) +DoKasPrincipalUnlock(struct cmd_syndesc *as, void *arock) { typedef enum { PRINCIPAL, INSTANCE } DoKasPrincipalUnlock_parm_t; afs_status_t st = 0; @@ -307,7 +307,7 @@ DoKasPrincipalUnlock(struct cmd_syndesc *as, char *arock) } int -DoKasPrincipalFieldsSet(struct cmd_syndesc *as, char *arock) +DoKasPrincipalFieldsSet(struct cmd_syndesc *as, void *arock) { typedef enum { PRINCIPAL, INSTANCE, ADMIN, NOADMIN, GRANTTICKET, NOGRANTTICKET, ENCRYPT2, NOENCRYPT, CHANGEPASSWORD, @@ -549,7 +549,7 @@ Print_kas_serverStats_p(kas_serverStats_p stats, const char *prefix) } int -DoKasServerStatsGet(struct cmd_syndesc *as, char *arock) +DoKasServerStatsGet(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER } DoKasServerStatsGet_parm_t; afs_status_t st = 0; @@ -634,7 +634,7 @@ Print_kas_serverDebugInfo_p(kas_serverDebugInfo_p debug, const char *prefix) } int -DoKasServerDebugGet(struct cmd_syndesc *as, char *arock) +DoKasServerDebugGet(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER } DoKasServerDebugGet_parm_t; afs_status_t st = 0; @@ -662,7 +662,7 @@ DoKasServerDebugGet(struct cmd_syndesc *as, char *arock) } int -DoKasServerRandomKeyGet(struct cmd_syndesc *as, char *arock) +DoKasServerRandomKeyGet(struct cmd_syndesc *as, void *arock) { afs_status_t st = 0; kas_encryptionKey_t key; @@ -686,7 +686,7 @@ SetupKasAdminCmd(void) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax("KasPrincipalCreate", DoKasPrincipalCreate, 0, + ts = cmd_CreateSyntax("KasPrincipalCreate", DoKasPrincipalCreate, NULL, "create a new principal"); cmd_AddParm(ts, "-principal", CMD_SINGLE, CMD_REQUIRED, "principal to create"); @@ -696,7 +696,7 @@ SetupKasAdminCmd(void) "initial principal password"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("KasPrincipalDelete", DoKasPrincipalDelete, 0, + ts = cmd_CreateSyntax("KasPrincipalDelete", DoKasPrincipalDelete, NULL, "delete a principal"); cmd_AddParm(ts, "-principal", CMD_SINGLE, CMD_REQUIRED, "principal to delete"); @@ -704,7 +704,7 @@ SetupKasAdminCmd(void) "principal instance"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("KasPrincipalGet", DoKasPrincipalGet, 0, + ts = cmd_CreateSyntax("KasPrincipalGet", DoKasPrincipalGet, NULL, "get information about a principal"); cmd_AddParm(ts, "-principal", CMD_SINGLE, CMD_REQUIRED, "principal to get"); @@ -712,11 +712,11 @@ SetupKasAdminCmd(void) "principal instance"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("KasPrincipalList", DoKasPrincipalList, 0, + ts = cmd_CreateSyntax("KasPrincipalList", DoKasPrincipalList, NULL, "list all principals"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("KasPrincipalKeySet", DoKasPrincipalKeySet, 0, + ts = cmd_CreateSyntax("KasPrincipalKeySet", DoKasPrincipalKeySet, NULL, "set the password for a principal"); cmd_AddParm(ts, "-principal", CMD_SINGLE, CMD_REQUIRED, "principal to modify"); @@ -729,7 +729,7 @@ SetupKasAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("KasPrincipalLockStatusGet", - DoKasPrincipalLockStatusGet, 0, + DoKasPrincipalLockStatusGet, NULL, "get the lock status of a principal"); cmd_AddParm(ts, "-principal", CMD_SINGLE, CMD_REQUIRED, "principal to query"); @@ -737,7 +737,7 @@ SetupKasAdminCmd(void) "principal instance"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("KasPrincipalUnlock", DoKasPrincipalUnlock, 0, + ts = cmd_CreateSyntax("KasPrincipalUnlock", DoKasPrincipalUnlock, NULL, "unlock a principal"); cmd_AddParm(ts, "-principal", CMD_SINGLE, CMD_REQUIRED, "principal to unlock"); @@ -745,7 +745,7 @@ SetupKasAdminCmd(void) "principal instance"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("KasPrincipalFieldsSet", DoKasPrincipalFieldsSet, 0, + ts = cmd_CreateSyntax("KasPrincipalFieldsSet", DoKasPrincipalFieldsSet, NULL, "modify a principal"); cmd_AddParm(ts, "-principal", CMD_SINGLE, CMD_REQUIRED, "principal to modify"); @@ -785,17 +785,17 @@ SetupKasAdminCmd(void) "maximum failed password attempts is exceeded"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("KasServerStatsGet", DoKasServerStatsGet, 0, + ts = cmd_CreateSyntax("KasServerStatsGet", DoKasServerStatsGet, NULL, "get stats on a kaserver"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("KasServerDebugGet", DoKasServerDebugGet, 0, + ts = cmd_CreateSyntax("KasServerDebugGet", DoKasServerDebugGet, NULL, "get debug info from a kaserver"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("KasServerRandomKeyGet", DoKasServerRandomKeyGet, 0, + ts = cmd_CreateSyntax("KasServerRandomKeyGet", DoKasServerRandomKeyGet, NULL, "create a random key"); SetupCommonCmdArgs(ts); diff --git a/src/libadmin/test/pts.c b/src/libadmin/test/pts.c index b48c81c2c..36a6cd385 100644 --- a/src/libadmin/test/pts.c +++ b/src/libadmin/test/pts.c @@ -90,7 +90,7 @@ GetUserAccessFromString(const char *in_str, const char *error_msg) } int -DoPtsGroupMemberAdd(struct cmd_syndesc *as, char *arock) +DoPtsGroupMemberAdd(struct cmd_syndesc *as, void *arock) { typedef enum { USER, GROUP } DoPtsGroupMemberAdd_parm_t; afs_status_t st = 0; @@ -105,7 +105,7 @@ DoPtsGroupMemberAdd(struct cmd_syndesc *as, char *arock) } int -DoPtsGroupOwnerChange(struct cmd_syndesc *as, char *arock) +DoPtsGroupOwnerChange(struct cmd_syndesc *as, void *arock) { typedef enum { OWNER, GROUP } DoPtsGroupOwnerChange_parm_t; afs_status_t st = 0; @@ -120,7 +120,7 @@ DoPtsGroupOwnerChange(struct cmd_syndesc *as, char *arock) } int -DoPtsGroupCreate(struct cmd_syndesc *as, char *arock) +DoPtsGroupCreate(struct cmd_syndesc *as, void *arock) { typedef enum { OWNER, GROUP } DoPtsGroupCreate_parm_t; afs_status_t st = 0; @@ -170,7 +170,7 @@ Print_pts_GroupEntry_p(pts_GroupEntry_p entry, const char *prefix) } int -DoPtsGroupGet(struct cmd_syndesc *as, char *arock) +DoPtsGroupGet(struct cmd_syndesc *as, void *arock) { typedef enum { GROUP } DoPtsGroupGet_parm_t; afs_status_t st = 0; @@ -187,7 +187,7 @@ DoPtsGroupGet(struct cmd_syndesc *as, char *arock) } int -DoPtsGroupDelete(struct cmd_syndesc *as, char *arock) +DoPtsGroupDelete(struct cmd_syndesc *as, void *arock) { typedef enum { GROUP } DoPtsGroupDelete_parm_t; afs_status_t st = 0; @@ -201,7 +201,7 @@ DoPtsGroupDelete(struct cmd_syndesc *as, char *arock) } int -DoPtsGroupMaxGet(struct cmd_syndesc *as, char *arock) +DoPtsGroupMaxGet(struct cmd_syndesc *as, void *arock) { afs_status_t st = 0; int max_group_id; @@ -214,7 +214,7 @@ DoPtsGroupMaxGet(struct cmd_syndesc *as, char *arock) } int -DoPtsGroupMaxSet(struct cmd_syndesc *as, char *arock) +DoPtsGroupMaxSet(struct cmd_syndesc *as, void *arock) { typedef enum { MAX } DoPtsGroupMaxSet_parm_t; afs_status_t st = 0; @@ -231,7 +231,7 @@ DoPtsGroupMaxSet(struct cmd_syndesc *as, char *arock) } int -DoPtsGroupMemberList(struct cmd_syndesc *as, char *arock) +DoPtsGroupMemberList(struct cmd_syndesc *as, void *arock) { typedef enum { GROUP } DoPtsGroupMemberList_parm_t; afs_status_t st = 0; @@ -260,7 +260,7 @@ DoPtsGroupMemberList(struct cmd_syndesc *as, char *arock) } int -DoPtsGroupMemberRemove(struct cmd_syndesc *as, char *arock) +DoPtsGroupMemberRemove(struct cmd_syndesc *as, void *arock) { typedef enum { USER, GROUP } DoPtsGroupMemberRemove_parm_t; afs_status_t st = 0; @@ -275,7 +275,7 @@ DoPtsGroupMemberRemove(struct cmd_syndesc *as, char *arock) } int -DoPtsGroupRename(struct cmd_syndesc *as, char *arock) +DoPtsGroupRename(struct cmd_syndesc *as, void *arock) { typedef enum { GROUP, NEWNAME } DoPtsGroupRename_parm_t; afs_status_t st = 0; @@ -290,7 +290,7 @@ DoPtsGroupRename(struct cmd_syndesc *as, char *arock) } int -DoPtsGroupModify(struct cmd_syndesc *as, char *arock) +DoPtsGroupModify(struct cmd_syndesc *as, void *arock) { typedef enum { GROUP, LISTSTATUS, LISTGROUPSOWNED, LISTMEMBERSHIP, LISTADD, LISTDELTE @@ -323,7 +323,7 @@ DoPtsGroupModify(struct cmd_syndesc *as, char *arock) } int -DoPtsUserCreate(struct cmd_syndesc *as, char *arock) +DoPtsUserCreate(struct cmd_syndesc *as, void *arock) { typedef enum { USER } DoPtsUserCreate_parm_t; afs_status_t st = 0; @@ -340,7 +340,7 @@ DoPtsUserCreate(struct cmd_syndesc *as, char *arock) } int -DoPtsUserDelete(struct cmd_syndesc *as, char *arock) +DoPtsUserDelete(struct cmd_syndesc *as, void *arock) { typedef enum { USER } DoPtsUserDelete_parm_t; afs_status_t st = 0; @@ -383,7 +383,7 @@ Print_pts_UserEntry_p(pts_UserEntry_p entry, const char *prefix) } int -DoPtsUserGet(struct cmd_syndesc *as, char *arock) +DoPtsUserGet(struct cmd_syndesc *as, void *arock) { typedef enum { USER } DoPtsUserGet_parm_t; afs_status_t st = 0; @@ -400,7 +400,7 @@ DoPtsUserGet(struct cmd_syndesc *as, char *arock) } int -DoPtsUserRename(struct cmd_syndesc *as, char *arock) +DoPtsUserRename(struct cmd_syndesc *as, void *arock) { typedef enum { USER, NEWNAME } DoPtsUserRename_parm_t; afs_status_t st = 0; @@ -415,7 +415,7 @@ DoPtsUserRename(struct cmd_syndesc *as, char *arock) } int -DoPtsUserModify(struct cmd_syndesc *as, char *arock) +DoPtsUserModify(struct cmd_syndesc *as, void *arock) { typedef enum { USER, GROUPQUOTA, LISTSTATUS, LISTGROUPSOWNED, LISTMEMBERSHIP @@ -481,7 +481,7 @@ DoPtsUserModify(struct cmd_syndesc *as, char *arock) } int -DoPtsUserMaxGet(struct cmd_syndesc *as, char *arock) +DoPtsUserMaxGet(struct cmd_syndesc *as, void *arock) { afs_status_t st = 0; int max_user_id; @@ -494,7 +494,7 @@ DoPtsUserMaxGet(struct cmd_syndesc *as, char *arock) } int -DoPtsUserMaxSet(struct cmd_syndesc *as, char *arock) +DoPtsUserMaxSet(struct cmd_syndesc *as, void *arock) { typedef enum { MAX } DoPtsUserMaxSet_parm_t; afs_status_t st = 0; @@ -511,7 +511,7 @@ DoPtsUserMaxSet(struct cmd_syndesc *as, char *arock) } int -DoPtsUserMemberList(struct cmd_syndesc *as, char *arock) +DoPtsUserMemberList(struct cmd_syndesc *as, void *arock) { typedef enum { USER } DoPtsUserMemberList_parm_t; afs_status_t st = 0; @@ -541,7 +541,7 @@ DoPtsUserMemberList(struct cmd_syndesc *as, char *arock) } int -DoPtsOwnedGroupList(struct cmd_syndesc *as, char *arock) +DoPtsOwnedGroupList(struct cmd_syndesc *as, void *arock) { typedef enum { USER } DoPtsOwnedGroupList_parm_t; afs_status_t st = 0; @@ -575,61 +575,61 @@ SetupPtsAdminCmd(void) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax("PtsGroupMemberAdd", DoPtsGroupMemberAdd, 0, + ts = cmd_CreateSyntax("PtsGroupMemberAdd", DoPtsGroupMemberAdd, NULL, "add a user to a group"); cmd_AddParm(ts, "-user", CMD_SINGLE, CMD_REQUIRED, "user to add"); cmd_AddParm(ts, "-group", CMD_SINGLE, CMD_REQUIRED, "group to modify"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsGroupOwnerChange", DoPtsGroupOwnerChange, 0, + ts = cmd_CreateSyntax("PtsGroupOwnerChange", DoPtsGroupOwnerChange, NULL, "change the owner of a group"); cmd_AddParm(ts, "-owner", CMD_SINGLE, CMD_REQUIRED, "new owner"); cmd_AddParm(ts, "-group", CMD_SINGLE, CMD_REQUIRED, "group to modify"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsGroupCreate", DoPtsGroupCreate, 0, + ts = cmd_CreateSyntax("PtsGroupCreate", DoPtsGroupCreate, NULL, "create a new group"); cmd_AddParm(ts, "-owner", CMD_SINGLE, CMD_REQUIRED, "owner of group"); cmd_AddParm(ts, "-group", CMD_SINGLE, CMD_REQUIRED, "group to create"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsGroupGet", DoPtsGroupGet, 0, + ts = cmd_CreateSyntax("PtsGroupGet", DoPtsGroupGet, NULL, "get information about a group"); cmd_AddParm(ts, "-group", CMD_SINGLE, CMD_REQUIRED, "group to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsGroupDelete", DoPtsGroupDelete, 0, + ts = cmd_CreateSyntax("PtsGroupDelete", DoPtsGroupDelete, NULL, "delete a group"); cmd_AddParm(ts, "-group", CMD_SINGLE, CMD_REQUIRED, "group to delete"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsGroupMaxGet", DoPtsGroupMaxGet, 0, + ts = cmd_CreateSyntax("PtsGroupMaxGet", DoPtsGroupMaxGet, NULL, "get the maximum group id"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsGroupMaxSet", DoPtsGroupMaxSet, 0, + ts = cmd_CreateSyntax("PtsGroupMaxSet", DoPtsGroupMaxSet, NULL, "set the maximum group id"); cmd_AddParm(ts, "-max", CMD_SINGLE, CMD_REQUIRED, "new max group id"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsGroupMemberList", DoPtsGroupMemberList, 0, + ts = cmd_CreateSyntax("PtsGroupMemberList", DoPtsGroupMemberList, NULL, "list members of a group"); cmd_AddParm(ts, "-group", CMD_SINGLE, CMD_REQUIRED, "group to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsGroupMemberRemove", DoPtsGroupMemberRemove, 0, + ts = cmd_CreateSyntax("PtsGroupMemberRemove", DoPtsGroupMemberRemove, NULL, "remove a member from a group"); cmd_AddParm(ts, "-user", CMD_SINGLE, CMD_REQUIRED, "user to remove"); cmd_AddParm(ts, "-group", CMD_SINGLE, CMD_REQUIRED, "group to modify"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsGroupRename", DoPtsGroupRename, 0, + ts = cmd_CreateSyntax("PtsGroupRename", DoPtsGroupRename, NULL, "rename a group"); cmd_AddParm(ts, "-group", CMD_SINGLE, CMD_REQUIRED, "group to modify"); cmd_AddParm(ts, "-newname", CMD_SINGLE, CMD_REQUIRED, "new group name"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsGroupModify", DoPtsGroupModify, 0, + ts = cmd_CreateSyntax("PtsGroupModify", DoPtsGroupModify, NULL, "modify a group"); cmd_AddParm(ts, "-group", CMD_SINGLE, CMD_REQUIRED, "group to modify"); cmd_AddParm(ts, "-liststatus", CMD_SINGLE, CMD_REQUIRED, @@ -644,28 +644,28 @@ SetupPtsAdminCmd(void) "list delete permission "); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsUserCreate", DoPtsUserCreate, 0, + ts = cmd_CreateSyntax("PtsUserCreate", DoPtsUserCreate, NULL, "create a new user"); cmd_AddParm(ts, "-user", CMD_SINGLE, CMD_REQUIRED, "user to create"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsUserDelete", DoPtsUserDelete, 0, + ts = cmd_CreateSyntax("PtsUserDelete", DoPtsUserDelete, NULL, "delete a user"); cmd_AddParm(ts, "-user", CMD_SINGLE, CMD_REQUIRED, "user to delete"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsUserGet", DoPtsUserGet, 0, + ts = cmd_CreateSyntax("PtsUserGet", DoPtsUserGet, NULL, "get information about a user"); cmd_AddParm(ts, "-user", CMD_SINGLE, CMD_REQUIRED, "user to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsUserRename", DoPtsUserRename, 0, + ts = cmd_CreateSyntax("PtsUserRename", DoPtsUserRename, NULL, "rename a user"); cmd_AddParm(ts, "-user", CMD_SINGLE, CMD_REQUIRED, "user to modify"); cmd_AddParm(ts, "-newname", CMD_SINGLE, CMD_REQUIRED, "new user name"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsUserModify", DoPtsUserModify, 0, + ts = cmd_CreateSyntax("PtsUserModify", DoPtsUserModify, NULL, "change a user"); cmd_AddParm(ts, "-user", CMD_SINGLE, CMD_REQUIRED, "user to modify"); cmd_AddParm(ts, "-groupquota", CMD_SINGLE, CMD_OPTIONAL, @@ -678,21 +678,21 @@ SetupPtsAdminCmd(void) "list membership permission "); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsUserMaxGet", DoPtsUserMaxGet, 0, + ts = cmd_CreateSyntax("PtsUserMaxGet", DoPtsUserMaxGet, NULL, "get the max user id"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsUserMaxSet", DoPtsUserMaxSet, 0, + ts = cmd_CreateSyntax("PtsUserMaxSet", DoPtsUserMaxSet, NULL, "set the max user id"); cmd_AddParm(ts, "-max", CMD_SINGLE, CMD_REQUIRED, "max user id"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsUserMemberList", DoPtsUserMemberList, 0, + ts = cmd_CreateSyntax("PtsUserMemberList", DoPtsUserMemberList, NULL, "list group membership for a user"); cmd_AddParm(ts, "-user", CMD_SINGLE, CMD_REQUIRED, "user to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsOwnedGroupList", DoPtsOwnedGroupList, 0, + ts = cmd_CreateSyntax("PtsOwnedGroupList", DoPtsOwnedGroupList, NULL, "list groups owned by a user"); cmd_AddParm(ts, "-user", CMD_SINGLE, CMD_REQUIRED, "user to query"); SetupCommonCmdArgs(ts); diff --git a/src/libadmin/test/util.c b/src/libadmin/test/util.c index 7ef958655..da4261f8d 100644 --- a/src/libadmin/test/util.c +++ b/src/libadmin/test/util.c @@ -20,7 +20,7 @@ RCSID #include "util.h" int -DoUtilErrorTranslate(struct cmd_syndesc *as, char *arock) +DoUtilErrorTranslate(struct cmd_syndesc *as, void *arock) { typedef enum { ERROR_CODE } DoUtilErrorTranslate_parm_t; afs_status_t st = 0; @@ -37,7 +37,7 @@ DoUtilErrorTranslate(struct cmd_syndesc *as, char *arock) } int -DoUtilDatabaseServerList(struct cmd_syndesc *as, char *arock) +DoUtilDatabaseServerList(struct cmd_syndesc *as, void *arock) { typedef enum { CELL_NAME } DoUtilDatabaseServerList_parm_t; afs_status_t st = 0; @@ -66,7 +66,7 @@ DoUtilDatabaseServerList(struct cmd_syndesc *as, char *arock) } int -DoUtilNameToAddress(struct cmd_syndesc *as, char *arock) +DoUtilNameToAddress(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER_NAME } DoUtilNameToAddress_parm_t; afs_status_t st = 0; @@ -88,17 +88,17 @@ SetupUtilAdminCmd(void) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax("UtilErrorTranslate", DoUtilErrorTranslate, 0, + ts = cmd_CreateSyntax("UtilErrorTranslate", DoUtilErrorTranslate, NULL, "translate an error code"); cmd_AddParm(ts, "-error", CMD_SINGLE, CMD_REQUIRED, "error code"); SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("UtilDatabaseServerList", DoUtilDatabaseServerList, - 0, "list the database servers in a cell"); + NULL, "list the database servers in a cell"); cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_REQUIRED, "cell to list"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("UtilNameToAddress", DoUtilNameToAddress, 0, + ts = cmd_CreateSyntax("UtilNameToAddress", DoUtilNameToAddress, NULL, "translate a host name to an address"); cmd_AddParm(ts, "-host", CMD_SINGLE, CMD_REQUIRED, "host name"); SetupCommonCmdArgs(ts); diff --git a/src/libadmin/test/util.h b/src/libadmin/test/util.h index ca524597d..98f22f6b4 100644 --- a/src/libadmin/test/util.h +++ b/src/libadmin/test/util.h @@ -29,13 +29,13 @@ #include "common.h" int - DoUtilErrorTranslate(struct cmd_syndesc *as, char *arock); + DoUtilErrorTranslate(struct cmd_syndesc *as, void *arock); int - DoUtilDatabaseServerList(struct cmd_syndesc *as, char *arock); + DoUtilDatabaseServerList(struct cmd_syndesc *as, void *arock); int - DoUtilNameToAddress(struct cmd_syndesc *as, char *arock); + DoUtilNameToAddress(struct cmd_syndesc *as, void *arock); void SetupUtilAdminCmd(void); diff --git a/src/libadmin/test/vos.c b/src/libadmin/test/vos.c index 2882fad23..86a4175bf 100644 --- a/src/libadmin/test/vos.c +++ b/src/libadmin/test/vos.c @@ -141,7 +141,7 @@ PrintMessage(vos_messageType_t type, char *message) } int -DoVosBackupVolumeCreate(struct cmd_syndesc *as, char *arock) +DoVosBackupVolumeCreate(struct cmd_syndesc *as, void *arock) { typedef enum { VOLUME } DoVosBackupVolumeCreate_parm_t; afs_status_t st = 0; @@ -159,7 +159,7 @@ DoVosBackupVolumeCreate(struct cmd_syndesc *as, char *arock) } int -DoVosBackupVolumeCreateMultiple(struct cmd_syndesc *as, char *arock) +DoVosBackupVolumeCreateMultiple(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PARTITION, PREFIX, EXCLUDE @@ -211,7 +211,7 @@ Print_vos_partitionEntry_p(vos_partitionEntry_p part, const char *prefix) } int -DoVosPartitionGet(struct cmd_syndesc *as, char *arock) +DoVosPartitionGet(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PARTITION } DoVosPartitionGet_parm_t; afs_status_t st = 0; @@ -242,7 +242,7 @@ DoVosPartitionGet(struct cmd_syndesc *as, char *arock) } int -DoVosPartitionList(struct cmd_syndesc *as, char *arock) +DoVosPartitionList(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER } DoVosPartitionGet_parm_t; afs_status_t st = 0; @@ -278,7 +278,7 @@ DoVosPartitionList(struct cmd_syndesc *as, char *arock) } int -DoVosServerSync(struct cmd_syndesc *as, char *arock) +DoVosServerSync(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PARTITION } DoVosServerSync_parm_t; afs_status_t st = 0; @@ -306,7 +306,7 @@ DoVosServerSync(struct cmd_syndesc *as, char *arock) } int -DoVosFileServerAddressChange(struct cmd_syndesc *as, char *arock) +DoVosFileServerAddressChange(struct cmd_syndesc *as, void *arock) { typedef enum { OLDADDRESS, NEWADDRESS @@ -331,7 +331,7 @@ DoVosFileServerAddressChange(struct cmd_syndesc *as, char *arock) } int -DoVosFileServerAddressRemove(struct cmd_syndesc *as, char *arock) +DoVosFileServerAddressRemove(struct cmd_syndesc *as, void *arock) { typedef enum { ADDRESS } DoVosFileServerAddressRemove_parm_t; afs_status_t st = 0; @@ -360,7 +360,7 @@ Print_vos_fileServerEntry_p(vos_fileServerEntry_p serv, const char *prefix) } int -DoVosFileServerList(struct cmd_syndesc *as, char *arock) +DoVosFileServerList(struct cmd_syndesc *as, void *arock) { afs_status_t st = 0; void *iter; @@ -411,7 +411,7 @@ Print_vos_serverTransactionStatus_p(vos_serverTransactionStatus_p tran, } int -DoVosServerTransactionStatusList(struct cmd_syndesc *as, char *arock) +DoVosServerTransactionStatusList(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER } DoVosServerTransactionStatusList_parm_t; afs_status_t st = 0; @@ -519,7 +519,7 @@ Print_vos_vldbEntry_p(vos_vldbEntry_p entry, const char *prefix) } int -DoVosVLDBGet(struct cmd_syndesc *as, char *arock) +DoVosVLDBGet(struct cmd_syndesc *as, void *arock) { typedef enum { VOLUME } DoVosVLDBGet_parm_t; afs_status_t st = 0; @@ -543,7 +543,7 @@ DoVosVLDBGet(struct cmd_syndesc *as, char *arock) } int -DoVosVLDBList(struct cmd_syndesc *as, char *arock) +DoVosVLDBList(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PARTITION } DoVosVLDBList_parm_t; afs_status_t st = 0; @@ -591,7 +591,7 @@ DoVosVLDBList(struct cmd_syndesc *as, char *arock) } int -DoVosVLDBEntryRemove(struct cmd_syndesc *as, char *arock) +DoVosVLDBEntryRemove(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PARTITION, VOLUME } DoVosVLDBEntryRemove_parm_t; afs_status_t st = 0; @@ -634,7 +634,7 @@ DoVosVLDBEntryRemove(struct cmd_syndesc *as, char *arock) } int -DoVosVLDBUnlock(struct cmd_syndesc *as, char *arock) +DoVosVLDBUnlock(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PARTITION } DoVosVLDBUnlock_parm_t; afs_status_t st = 0; @@ -668,7 +668,7 @@ DoVosVLDBUnlock(struct cmd_syndesc *as, char *arock) } int -DoVosVLDBEntryLock(struct cmd_syndesc *as, char *arock) +DoVosVLDBEntryLock(struct cmd_syndesc *as, void *arock) { typedef enum { VOLUME } DoVosVLDBEntryLoc_parm_tk; afs_status_t st = 0; @@ -687,7 +687,7 @@ DoVosVLDBEntryLock(struct cmd_syndesc *as, char *arock) } int -DoVosVLDBEntryUnlock(struct cmd_syndesc *as, char *arock) +DoVosVLDBEntryUnlock(struct cmd_syndesc *as, void *arock) { typedef enum { VOLUME } DoVosVLDBEntryUnlock_parm_t; afs_status_t st = 0; @@ -706,7 +706,7 @@ DoVosVLDBEntryUnlock(struct cmd_syndesc *as, char *arock) } int -DoVosVLDBReadOnlySiteCreate(struct cmd_syndesc *as, char *arock) +DoVosVLDBReadOnlySiteCreate(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PARTITION, VOLUME @@ -741,7 +741,7 @@ DoVosVLDBReadOnlySiteCreate(struct cmd_syndesc *as, char *arock) } int -DoVosVLDBReadOnlySiteDelete(struct cmd_syndesc *as, char *arock) +DoVosVLDBReadOnlySiteDelete(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PARTITION, VOLUME @@ -777,7 +777,7 @@ DoVosVLDBReadOnlySiteDelete(struct cmd_syndesc *as, char *arock) } int -DoVosVLDBSync(struct cmd_syndesc *as, char *arock) +DoVosVLDBSync(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PARTITION, FORCE } DoVosVLDBSync_parm_t; afs_status_t st = 0; @@ -816,7 +816,7 @@ DoVosVLDBSync(struct cmd_syndesc *as, char *arock) } int -DoVosVolumeCreate(struct cmd_syndesc *as, char *arock) +DoVosVolumeCreate(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PARTITION, VOLUME, QUOTA @@ -861,7 +861,7 @@ DoVosVolumeCreate(struct cmd_syndesc *as, char *arock) } int -DoVosVolumeDelete(struct cmd_syndesc *as, char *arock) +DoVosVolumeDelete(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PARTITION, VOLUME } DoVosVolumeDelete_parm_t; afs_status_t st = 0; @@ -895,7 +895,7 @@ DoVosVolumeDelete(struct cmd_syndesc *as, char *arock) } int -DoVosVolumeRename(struct cmd_syndesc *as, char *arock) +DoVosVolumeRename(struct cmd_syndesc *as, void *arock) { typedef enum { OLDVOLUME, NEWVOLUME } DoVosVolumeRename_parm_t; afs_status_t st = 0; @@ -919,7 +919,7 @@ DoVosVolumeRename(struct cmd_syndesc *as, char *arock) } int -DoVosVolumeDump(struct cmd_syndesc *as, char *arock) +DoVosVolumeDump(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PARTITION, VOLUME, STARTTIME, DUMPFILE @@ -975,7 +975,7 @@ DoVosVolumeDump(struct cmd_syndesc *as, char *arock) } int -DoVosVolumeRestore(struct cmd_syndesc *as, char *arock) +DoVosVolumeRestore(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PARTITION, ID, VOLUME, DUMPFILE, FULL @@ -1029,7 +1029,7 @@ DoVosVolumeRestore(struct cmd_syndesc *as, char *arock) } int -DoVosVolumeOnline(struct cmd_syndesc *as, char *arock) +DoVosVolumeOnline(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PARTITION, VOLUME, SLEEP, BUSY @@ -1077,7 +1077,7 @@ DoVosVolumeOnline(struct cmd_syndesc *as, char *arock) } int -DoVosVolumeOffline(struct cmd_syndesc *as, char *arock) +DoVosVolumeOffline(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PARTITION, VOLUME } DoVosVolumeOffline_parm_t; afs_status_t st = 0; @@ -1334,7 +1334,7 @@ Print_vos_volumeEntry_p(vos_volumeEntry_p entry, const char *prefix) } int -DoVosVolumeGet(struct cmd_syndesc *as, char *arock) +DoVosVolumeGet(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PARTITION, VOLUME } DoVosVolumeGet_parm_t; afs_status_t st = 0; @@ -1371,7 +1371,7 @@ DoVosVolumeGet(struct cmd_syndesc *as, char *arock) } int -DoVosVolumeList(struct cmd_syndesc *as, char *arock) +DoVosVolumeList(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PARTITION } DoVosVolumeList_parm_t; afs_status_t st = 0; @@ -1417,7 +1417,7 @@ DoVosVolumeList(struct cmd_syndesc *as, char *arock) } int -DoVosVolumeMove(struct cmd_syndesc *as, char *arock) +DoVosVolumeMove(struct cmd_syndesc *as, void *arock) { typedef enum { VOLUME, FROMSERVER, FROMPARTITION, TOSERVER, TOPARTITION @@ -1469,7 +1469,7 @@ DoVosVolumeMove(struct cmd_syndesc *as, char *arock) } int -DoVosVolumeRelease(struct cmd_syndesc *as, char *arock) +DoVosVolumeRelease(struct cmd_syndesc *as, void *arock) { typedef enum { VOLUME, FORCE } DoVosVolumeRelease_parm_t; afs_status_t st = 0; @@ -1492,7 +1492,7 @@ DoVosVolumeRelease(struct cmd_syndesc *as, char *arock) } int -DoVosVolumeZap(struct cmd_syndesc *as, char *arock) +DoVosVolumeZap(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PARTITION, VOLUME, FORCE } DoVosVolumeZap_parm_t; afs_status_t st = 0; @@ -1531,7 +1531,7 @@ DoVosVolumeZap(struct cmd_syndesc *as, char *arock) } int -DoVosPartitionNameToId(struct cmd_syndesc *as, char *arock) +DoVosPartitionNameToId(struct cmd_syndesc *as, void *arock) { typedef enum { PARTITION } DoVosPartitionNameToId_parm_t; afs_status_t st = 0; @@ -1549,7 +1549,7 @@ DoVosPartitionNameToId(struct cmd_syndesc *as, char *arock) } int -DoVosPartitionIdToName(struct cmd_syndesc *as, char *arock) +DoVosPartitionIdToName(struct cmd_syndesc *as, void *arock) { typedef enum { PARTITIONID } DoVosPartitionIdToName_parm_t; afs_status_t st = 0; @@ -1572,7 +1572,7 @@ DoVosPartitionIdToName(struct cmd_syndesc *as, char *arock) } int -DoVosVolumeQuotaChange(struct cmd_syndesc *as, char *arock) +DoVosVolumeQuotaChange(struct cmd_syndesc *as, void *arock) { typedef enum { SERVER, PARTITION, VOLUME, QUOTA @@ -1618,13 +1618,13 @@ SetupVosAdminCmd(void) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax("VosBackupVolumeCreate", DoVosBackupVolumeCreate, 0, + ts = cmd_CreateSyntax("VosBackupVolumeCreate", DoVosBackupVolumeCreate, NULL, "create a backup volume"); cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, "volume to back up"); SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("VosBackupVolumeCreateMultiple", - DoVosBackupVolumeCreateMultiple, 0, + DoVosBackupVolumeCreateMultiple, NULL, "create a backup volume"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "server housing volumes to back up"); @@ -1636,7 +1636,7 @@ SetupVosAdminCmd(void) "exclude volumes from backup that match prefix"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosPartitionGet", DoVosPartitionGet, 0, + ts = cmd_CreateSyntax("VosPartitionGet", DoVosPartitionGet, NULL, "get information about a partition"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server housing partition of interest"); @@ -1644,13 +1644,13 @@ SetupVosAdminCmd(void) "partition to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosPartitionList", DoVosPartitionList, 0, + ts = cmd_CreateSyntax("VosPartitionList", DoVosPartitionList, NULL, "list information about all partitions at a server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server housing partitions of interest"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosServerSync", DoVosServerSync, 0, + ts = cmd_CreateSyntax("VosServerSync", DoVosServerSync, NULL, "sync server with vldb"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to sync"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, @@ -1658,7 +1658,7 @@ SetupVosAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("VosFileServerAddressChange", - DoVosFileServerAddressChange, 0, + DoVosFileServerAddressChange, NULL, "change a server's address in the vldb"); cmd_AddParm(ts, "-oldaddress", CMD_SINGLE, CMD_REQUIRED, "old address to change"); @@ -1666,29 +1666,29 @@ SetupVosAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("VosFileServerAddressRemove", - DoVosFileServerAddressRemove, 0, + DoVosFileServerAddressRemove, NULL, "remove a server's address from the vldb"); cmd_AddParm(ts, "-address", CMD_SINGLE, CMD_REQUIRED, "address to remove"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosFileServerList", DoVosFileServerList, 0, + ts = cmd_CreateSyntax("VosFileServerList", DoVosFileServerList, NULL, "list the file servers in a cell"); SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("VosServerTransactionStatusList", - DoVosServerTransactionStatusList, 0, + DoVosServerTransactionStatusList, NULL, "list the active transactions at a server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVLDBGet", DoVosVLDBGet, 0, + ts = cmd_CreateSyntax("VosVLDBGet", DoVosVLDBGet, NULL, "get a vldb entry for a volume"); cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, "volume to retrieve"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVLDBList", DoVosVLDBList, 0, + ts = cmd_CreateSyntax("VosVLDBList", DoVosVLDBList, NULL, "list a group of vldb entries"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "limit entries to a particular server"); @@ -1696,7 +1696,7 @@ SetupVosAdminCmd(void) "limit entries to a particular partition"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVLDBEntryRemove", DoVosVLDBEntryRemove, 0, + ts = cmd_CreateSyntax("VosVLDBEntryRemove", DoVosVLDBEntryRemove, NULL, "remove vldb entries"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "limit entries to a particular server"); @@ -1705,7 +1705,7 @@ SetupVosAdminCmd(void) cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_OPTIONAL, "volume to remove"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVLDBUnlock", DoVosVLDBUnlock, 0, + ts = cmd_CreateSyntax("VosVLDBUnlock", DoVosVLDBUnlock, NULL, "unlock a group of vldb entries"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "limit entries to a particular server"); @@ -1713,18 +1713,18 @@ SetupVosAdminCmd(void) "limit entries to a particular partition"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVLDBEntryLock", DoVosVLDBList, 0, + ts = cmd_CreateSyntax("VosVLDBEntryLock", DoVosVLDBList, NULL, "lock a single vldb entry"); cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, "volume to lock"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVLDBEntryUnlock", DoVosVLDBEntryUnlock, 0, + ts = cmd_CreateSyntax("VosVLDBEntryUnlock", DoVosVLDBEntryUnlock, NULL, "unlock a single vldb entry"); cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, "volume to unlock"); SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("VosVLDBReadOnlySiteCreate", - DoVosVLDBReadOnlySiteCreate, 0, + DoVosVLDBReadOnlySiteCreate, NULL, "create a read only site"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where read only will be created"); @@ -1735,7 +1735,7 @@ SetupVosAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("VosVLDBReadOnlySiteDelete", - DoVosVLDBReadOnlySiteDelete, 0, + DoVosVLDBReadOnlySiteDelete, NULL, "delete a read only site before initial replication"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "server where read only will be deleted"); @@ -1744,7 +1744,7 @@ SetupVosAdminCmd(void) cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, "volume to delete"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVLDBSync", DoVosVLDBSync, 0, + ts = cmd_CreateSyntax("VosVLDBSync", DoVosVLDBSync, NULL, "sync vldb with server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to sync"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, @@ -1752,7 +1752,7 @@ SetupVosAdminCmd(void) cmd_AddParm(ts, "-force", CMD_FLAG, CMD_OPTIONAL, "force sync to occur"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVolumeCreate", DoVosVolumeCreate, 0, + ts = cmd_CreateSyntax("VosVolumeCreate", DoVosVolumeCreate, NULL, "create a read write volume"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where volume will be created"); @@ -1764,7 +1764,7 @@ SetupVosAdminCmd(void) "size quota of new volume in 1kb units"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVolumeDelete", DoVosVolumeDelete, 0, + ts = cmd_CreateSyntax("VosVolumeDelete", DoVosVolumeDelete, NULL, "delete a volume"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where volume exists"); @@ -1773,13 +1773,13 @@ SetupVosAdminCmd(void) cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, "volume to delete"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVolumeRename", DoVosVolumeRename, 0, + ts = cmd_CreateSyntax("VosVolumeRename", DoVosVolumeRename, NULL, "rename a volume"); cmd_AddParm(ts, "-oldname", CMD_SINGLE, CMD_REQUIRED, "old volume name"); cmd_AddParm(ts, "-newname", CMD_SINGLE, CMD_REQUIRED, "new volume name"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVolumeDump", DoVosVolumeDump, 0, + ts = cmd_CreateSyntax("VosVolumeDump", DoVosVolumeDump, NULL, "dump a volume to a file"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "dump volume at a particular server"); @@ -1792,7 +1792,7 @@ SetupVosAdminCmd(void) "file to contain dump results"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVolumeRestore", DoVosVolumeRestore, 0, + ts = cmd_CreateSyntax("VosVolumeRestore", DoVosVolumeRestore, NULL, "restore a volume from a dumpfile"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server that houses volume to restore"); @@ -1807,7 +1807,7 @@ SetupVosAdminCmd(void) "does a full restore of volume"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVolumeOnline", DoVosVolumeOnline, 0, + ts = cmd_CreateSyntax("VosVolumeOnline", DoVosVolumeOnline, NULL, "bring a volume online"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server that houses volume"); @@ -1819,7 +1819,7 @@ SetupVosAdminCmd(void) cmd_AddParm(ts, "-busy", CMD_FLAG, CMD_OPTIONAL, "mark volume busy"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVolumeOffline", DoVosVolumeOffline, 0, + ts = cmd_CreateSyntax("VosVolumeOffline", DoVosVolumeOffline, NULL, "take a volume offline"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server that houses volume"); @@ -1829,7 +1829,7 @@ SetupVosAdminCmd(void) "volume to bring offline"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVolumeGet", DoVosVolumeGet, 0, + ts = cmd_CreateSyntax("VosVolumeGet", DoVosVolumeGet, NULL, "get a volume entry"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server that houses volume"); @@ -1839,7 +1839,7 @@ SetupVosAdminCmd(void) "volume to retrieve"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVolumeList", DoVosVolumeList, 0, + ts = cmd_CreateSyntax("VosVolumeList", DoVosVolumeList, NULL, "list a group of volumes"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "limit volumes to a particular server"); @@ -1847,7 +1847,7 @@ SetupVosAdminCmd(void) "limit volumes to a particular partition"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVolumeMove", DoVosVolumeMove, 0, + ts = cmd_CreateSyntax("VosVolumeMove", DoVosVolumeMove, NULL, "move a volume"); cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, "volume to move"); cmd_AddParm(ts, "-fromserver", CMD_SINGLE, CMD_REQUIRED, "source server"); @@ -1859,7 +1859,7 @@ SetupVosAdminCmd(void) "destination partition"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVolumeRelease", DoVosVolumeRelease, 0, + ts = cmd_CreateSyntax("VosVolumeRelease", DoVosVolumeRelease, NULL, "release updates to read only"); cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, "volume to replicate"); @@ -1867,7 +1867,7 @@ SetupVosAdminCmd(void) "force release to occur"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVolumeZap", DoVosVolumeZap, 0, "zap a volume"); + ts = cmd_CreateSyntax("VosVolumeZap", DoVosVolumeZap, NULL, "zap a volume"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server that houses the volume to zap"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_REQUIRED, @@ -1876,18 +1876,18 @@ SetupVosAdminCmd(void) cmd_AddParm(ts, "-force", CMD_FLAG, CMD_OPTIONAL, "force zap"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosPartitionNameToId", DoVosPartitionNameToId, 0, + ts = cmd_CreateSyntax("VosPartitionNameToId", DoVosPartitionNameToId, NULL, "convert a partition name to a number"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_REQUIRED, "partition to convert"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosPartitionIdToName", DoVosPartitionIdToName, 0, + ts = cmd_CreateSyntax("VosPartitionIdToName", DoVosPartitionIdToName, NULL, "convert a number to a partition"); cmd_AddParm(ts, "-id", CMD_SINGLE, CMD_REQUIRED, "number to convert"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVolumeQuotaChange", DoVosVolumeQuotaChange, 0, + ts = cmd_CreateSyntax("VosVolumeQuotaChange", DoVosVolumeQuotaChange, NULL, "change the quota for a partition"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server that houses the volume"); diff --git a/src/log/unlog.c b/src/log/unlog.c index 44eb712d4..b4f8146c2 100644 --- a/src/log/unlog.c +++ b/src/log/unlog.c @@ -64,7 +64,7 @@ struct tokenInfo { int -CommandProc(struct cmd_syndesc *as, char *arock) +CommandProc(struct cmd_syndesc *as, void *arock) { #define MAXCELLS 20 /* XXX */ struct cmd_item *itp; @@ -115,7 +115,7 @@ main(int argc, char *argv[]) sigaction(SIGSEGV, &nsa, NULL); #endif - ts = cmd_CreateSyntax(NULL, CommandProc, 0, + ts = cmd_CreateSyntax(NULL, CommandProc, NULL, "Release Kerberos authentication"); cmd_AddParm(ts, "-cell", CMD_LIST, CMD_OPTIONAL, "cell name"); diff --git a/src/ptserver/db_verify.c b/src/ptserver/db_verify.c index 9d321f586..8133eeb61 100644 --- a/src/ptserver/db_verify.c +++ b/src/ptserver/db_verify.c @@ -1427,7 +1427,7 @@ CheckPrDatabase(struct misc_data *misc) /* info & statistics */ #include "AFS_component_version_number.c" int -WorkerBee(struct cmd_syndesc *as, char *arock) +WorkerBee(struct cmd_syndesc *as, void *arock) { afs_int32 code; char *recreateFile; diff --git a/src/ptserver/pt_util.c b/src/ptserver/pt_util.c index 9275d1dc7..8416fb133 100644 --- a/src/ptserver/pt_util.c +++ b/src/ptserver/pt_util.c @@ -53,7 +53,7 @@ void fix_pre(); char *checkin(); char *check_core(); char *id_to_name(); -int CommandProc(struct cmd_syndesc *); +int CommandProc(struct cmd_syndesc *, void *); struct hash_entry { char h_name[PR_MAXNAMELEN]; @@ -105,7 +105,7 @@ main(int argc, char **argv) register struct cmd_syndesc *cs; /*Command line syntax descriptor */ register afs_int32 code; /*Return code */ - cs = cmd_CreateSyntax((char *)0, CommandProc, 0, + cs = cmd_CreateSyntax(NULL, CommandProc, NULL, "access protection database"); cmd_AddParm(cs, "-w", CMD_FLAG, CMD_OPTIONAL, "update prdb with contents of data file"); @@ -128,7 +128,7 @@ main(int argc, char **argv) } int -CommandProc(register struct cmd_syndesc *a_as) +CommandProc(register struct cmd_syndesc *a_as, void *arock) { register int i; register long code; diff --git a/src/ptserver/pts.c b/src/ptserver/pts.c index 12362f176..623095e48 100644 --- a/src/ptserver/pts.c +++ b/src/ptserver/pts.c @@ -1020,7 +1020,7 @@ main(int argc, char **argv) sigaction(SIGSEGV, &nsa, NULL); #endif - ts = cmd_CreateSyntax("creategroup", CreateGroup, 0, + ts = cmd_CreateSyntax("creategroup", CreateGroup, NULL, "create a new group"); cmd_AddParm(ts, "-name", CMD_LIST, 0, "group name"); cmd_AddParm(ts, "-owner", CMD_SINGLE, CMD_OPTIONAL, "owner of the group"); @@ -1029,60 +1029,60 @@ main(int argc, char **argv) add_std_args(ts); cmd_CreateAlias(ts, "cg"); - ts = cmd_CreateSyntax("createuser", CreateUser, 0, "create a new user"); + ts = cmd_CreateSyntax("createuser", CreateUser, NULL, "create a new user"); cmd_AddParm(ts, "-name", CMD_LIST, 0, "user name"); cmd_AddParm(ts, "-id", CMD_LIST, CMD_OPTIONAL, "user id"); add_std_args(ts); cmd_CreateAlias(ts, "cu"); - ts = cmd_CreateSyntax("adduser", AddToGroup, 0, "add a user to a group"); + ts = cmd_CreateSyntax("adduser", AddToGroup, NULL, "add a user to a group"); cmd_AddParm(ts, "-user", CMD_LIST, 0, "user name"); cmd_AddParm(ts, "-group", CMD_LIST, 0, "group name"); add_std_args(ts); - ts = cmd_CreateSyntax("removeuser", RemoveFromGroup, 0, + ts = cmd_CreateSyntax("removeuser", RemoveFromGroup, NULL, "remove a user from a group"); cmd_AddParm(ts, "-user", CMD_LIST, 0, "user name"); cmd_AddParm(ts, "-group", CMD_LIST, 0, "group name"); add_std_args(ts); - ts = cmd_CreateSyntax("membership", ListMembership, 0, + ts = cmd_CreateSyntax("membership", ListMembership, NULL, "list membership of a user or group"); cmd_AddParm(ts, "-nameorid", CMD_LIST, 0, "user or group name or id"); add_std_args(ts); cmd_CreateAlias(ts, "groups"); - ts = cmd_CreateSyntax("delete", Delete, 0, + ts = cmd_CreateSyntax("delete", Delete, NULL, "delete a user or group from database"); cmd_AddParm(ts, "-nameorid", CMD_LIST, 0, "user or group name or id"); add_std_args(ts); - ts = cmd_CreateSyntax("examine", CheckEntry, 0, "examine an entry"); + ts = cmd_CreateSyntax("examine", CheckEntry, NULL, "examine an entry"); cmd_AddParm(ts, "-nameorid", CMD_LIST, 0, "user or group name or id"); add_std_args(ts); cmd_CreateAlias(ts, "check"); - ts = cmd_CreateSyntax("chown", ChownGroup, 0, + ts = cmd_CreateSyntax("chown", ChownGroup, NULL, "change ownership of a group"); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "group name"); cmd_AddParm(ts, "-owner", CMD_SINGLE, 0, "new owner"); add_std_args(ts); - ts = cmd_CreateSyntax("rename", ChangeName, 0, "rename user or group"); + ts = cmd_CreateSyntax("rename", ChangeName, NULL, "rename user or group"); cmd_AddParm(ts, "-oldname", CMD_SINGLE, 0, "old name"); cmd_AddParm(ts, "-newname", CMD_SINGLE, 0, "new name"); add_std_args(ts); cmd_CreateAlias(ts, "chname"); - ts = cmd_CreateSyntax("listmax", ListMax, 0, "list max id"); + ts = cmd_CreateSyntax("listmax", ListMax, NULL, "list max id"); add_std_args(ts); - ts = cmd_CreateSyntax("setmax", SetMax, 0, "set max id"); + ts = cmd_CreateSyntax("setmax", SetMax, NULL, "set max id"); cmd_AddParm(ts, "-group", CMD_SINGLE, CMD_OPTIONAL, "group max"); cmd_AddParm(ts, "-user", CMD_SINGLE, CMD_OPTIONAL, "user max"); add_std_args(ts); - ts = cmd_CreateSyntax("setfields", SetFields, 0, + ts = cmd_CreateSyntax("setfields", SetFields, NULL, "set fields for an entry"); cmd_AddParm(ts, "-nameorid", CMD_LIST, 0, "user or group name or id"); cmd_AddParm(ts, "-access", CMD_SINGLE, CMD_OPTIONAL, "set privacy flags"); @@ -1094,30 +1094,30 @@ main(int argc, char **argv) #endif add_std_args(ts); - ts = cmd_CreateSyntax("listowned", ListOwned, 0, + ts = cmd_CreateSyntax("listowned", ListOwned, NULL, "list groups owned by an entry or zero id gets orphaned groups"); cmd_AddParm(ts, "-nameorid", CMD_LIST, 0, "user or group name or id"); add_std_args(ts); - ts = cmd_CreateSyntax("listentries", ListEntries, 0, + ts = cmd_CreateSyntax("listentries", ListEntries, NULL, "list users/groups in the protection database"); cmd_AddParm(ts, "-users", CMD_FLAG, CMD_OPTIONAL, "list user entries"); cmd_AddParm(ts, "-groups", CMD_FLAG, CMD_OPTIONAL, "list group entries"); add_std_args(ts); - ts = cmd_CreateSyntax("interactive", pts_Interactive, 0, + ts = cmd_CreateSyntax("interactive", pts_Interactive, NULL, "enter interactive mode"); add_std_args(ts); cmd_CreateAlias(ts, "in"); - ts = cmd_CreateSyntax("quit", pts_Quit, 0, "exit program"); + ts = cmd_CreateSyntax("quit", pts_Quit, NULL, "exit program"); add_std_args(ts); - ts = cmd_CreateSyntax("source", pts_Source, 0, "read commands from file"); + ts = cmd_CreateSyntax("source", pts_Source, NULL, "read commands from file"); cmd_AddParm(ts, "-file", CMD_SINGLE, 0, "filename"); add_std_args(ts); - ts = cmd_CreateSyntax("sleep", pts_Sleep, 0, "pause for a bit"); + ts = cmd_CreateSyntax("sleep", pts_Sleep, NULL, "pause for a bit"); cmd_AddParm(ts, "-delay", CMD_SINGLE, 0, "seconds"); add_std_args(ts); diff --git a/src/ptserver/testpt.c b/src/ptserver/testpt.c index ab9f408d3..abdab42a2 100644 --- a/src/ptserver/testpt.c +++ b/src/ptserver/testpt.c @@ -51,7 +51,7 @@ static char conf_dir[100]; static char lcell[MAXCELLCHARS]; int -ListUsedIds(struct cmd_syndesc *as, char *arock) +ListUsedIds(struct cmd_syndesc *as, void *arock) { afs_int32 code; namelist lnames; @@ -404,7 +404,7 @@ RemUser(int u, int g) } int -TestManyMembers(struct cmd_syndesc *as, char *arock) +TestManyMembers(struct cmd_syndesc *as, void *arock) { char *filled; /* users filled up */ char *cleaned; /* users cleaned up */ @@ -761,7 +761,7 @@ ka_ConvertBytes(char *ascii, /* output buffer */ */ int -TestPrServ(struct cmd_syndesc *as, char *arock) +TestPrServ(struct cmd_syndesc *as, void *arock) { afs_int32 id; char name[PR_MAXNAMELEN + 1]; @@ -907,7 +907,7 @@ static char tmp_cell_file[128] = ""; static char tmp_noauth_file[128] = ""; static int -MyAfterProc(struct cmd_syndesc *as, char *arock) +MyAfterProc(struct cmd_syndesc *as, void *arock) { if (strlen(tmp_conf_file)) unlink(tmp_conf_file); @@ -921,7 +921,7 @@ MyAfterProc(struct cmd_syndesc *as, char *arock) } static int -MyBeforeProc(struct cmd_syndesc *as, char *arock) +MyBeforeProc(struct cmd_syndesc *as, void *arock) { afs_int32 code; int i; @@ -1103,7 +1103,7 @@ main(int argc, char *argv[]) cmd_SetBeforeProc(MyBeforeProc, NULL); cmd_SetAfterProc(MyAfterProc, NULL); - ts = cmd_CreateSyntax("usedIds", ListUsedIds, 0, + ts = cmd_CreateSyntax("usedIds", ListUsedIds, NULL, "Find used (or unused) user (or group) ids"); cmd_AddParm(ts, "-startId", CMD_SINGLE, CMD_OPTIONAL, "id to start checking"); @@ -1112,10 +1112,10 @@ main(int argc, char *argv[]) cmd_AddParm(ts, "-unused", CMD_FLAG, CMD_OPTIONAL, "print unused ids"); add_std_args(ts); - ts = cmd_CreateSyntax("initcmd", TestPrServ, 0, "test the prserver"); + ts = cmd_CreateSyntax("initcmd", TestPrServ, NULL, "test the prserver"); add_std_args(ts); - ts = cmd_CreateSyntax("testmanymembers", TestManyMembers, 0, + ts = cmd_CreateSyntax("testmanymembers", TestManyMembers, NULL, "test creating users and groups w/ many members"); cmd_AddParm(ts, "-number", CMD_SINGLE, 0, "number of users/groups to create"); diff --git a/src/rx/test/generator.c b/src/rx/test/generator.c index 2baf8d51e..2ca38cb4e 100644 --- a/src/rx/test/generator.c +++ b/src/rx/test/generator.c @@ -731,7 +731,7 @@ WriteCltTrailer(char *serverName, int first, int last, FILE * itl_h) fprintf(itl_h, "}\n"); fprintf(itl_h, - "\n\nstatic void DoRun(struct cmd_syndesc *as, char *arock) {\n"); + "\n\nstatic void DoRun(struct cmd_syndesc *as, void *arock) {\n"); if (threadModel == PTHREADS) { fprintf(itl_h, "\tpthread_t *tid;\n"); @@ -802,7 +802,7 @@ WriteCltTrailer(char *serverName, int first, int last, FILE * itl_h) fprintf(itl_h, "static void SetupRunCmd(void) {\n" "\tstruct cmd_syndesc *ts;\n" - "\tts = cmd_CreateSyntax(NULL,DoRun, 0, \"run the test client program\");\n" + "\tts = cmd_CreateSyntax(NULL,DoRun, NULL, \"run the test client program\");\n" "\tcmd_AddParm(ts, \"-threadCount\", CMD_SINGLE, CMD_REQUIRED, \"number of threads to spawn\");\n" "\tcmd_AddParm(ts, \"-iterationCount\", CMD_SINGLE, CMD_REQUIRED, \"number of iterations to make over entire interface for each thread\");\n" "\tcmd_AddParm(ts, \"-secType\", CMD_SINGLE, CMD_REQUIRED, \"security level to use (1 -> unauthenticated, 2 -> authenticated)\");\n" @@ -1187,7 +1187,7 @@ WriteServTrailer(FILE * srv_h) "\nstatic long GetKey (char *rock, long kvno, struct ktc_encryptionKey *key) {\n" "\tmemcpy ((void *) key, (void *) &serviceKey, sizeof(*key));\n" "\treturn 0;\n" "}\n\n" - "static void DoRun(struct cmd_syndesc *as, char *arock) {\n" + "static void DoRun(struct cmd_syndesc *as, void *arock) {\n" "\tstruct rx_service *serv;\n" "\tstruct rx_securityClass *sc[3];\n\n" "\tint port=0, errflg=0;\n" "\tint lowThreads=4, highThreads=8;\n" @@ -1204,7 +1204,7 @@ WriteServTrailer(FILE * srv_h) "\t\trx_SetMaxProcs(serv,highThreads);\n" "\t\trx_StartServer(1);\n" "\t}\n" "\texit(0);\n" "}\n\n" "static void SetupRunCmd(void) {\n" "\tstruct cmd_syndesc *ts;\n" - "\tts = cmd_CreateSyntax(NULL,DoRun, 0, \"run the test server program\");\n" + "\tts = cmd_CreateSyntax(NULL,DoRun, NULL, \"run the test server program\");\n" "\tcmd_AddParm(ts, \"-lowThreadCount\", CMD_SINGLE, CMD_REQUIRED, \"minimum number of threads to spawn\");\n" "\tcmd_AddParm(ts, \"-highThreadCount\", CMD_SINGLE, CMD_REQUIRED, \"maximum number of threads to spawn\");\n" "\tcmd_AddParm(ts, \"-serverPort\", CMD_SINGLE, CMD_REQUIRED, \"port that server is using\");\n" diff --git a/src/rxdebug/rxdebug.c b/src/rxdebug/rxdebug.c index dcc3ab8e8..8f6ba2f93 100644 --- a/src/rxdebug/rxdebug.c +++ b/src/rxdebug/rxdebug.c @@ -79,9 +79,7 @@ PortName(aname) } int -MainCommand(as, arock) - char *arock; - struct cmd_syndesc *as; +MainCommand(struct cmd_syndesc *as, void *arock) { register int i; int s; @@ -586,7 +584,7 @@ main(argc, argv) } #endif - ts = cmd_CreateSyntax(NULL, MainCommand, 0, "probe RX server"); + ts = cmd_CreateSyntax(NULL, MainCommand, NULL, "probe RX server"); cmd_AddParm(ts, "-servers", CMD_SINGLE, CMD_REQUIRED, "server machine"); cmd_AddParm(ts, "-port", CMD_SINGLE, CMD_OPTIONAL, "IP port"); cmd_AddParm(ts, "-nodally", CMD_FLAG, CMD_OPTIONAL, diff --git a/src/rxkad/test/stress.c b/src/rxkad/test/stress.c index eb578405d..ba3aec4a9 100644 --- a/src/rxkad/test/stress.c +++ b/src/rxkad/test/stress.c @@ -104,9 +104,7 @@ StringToAuth(authname) #define aKEYFILE 26 static int -CommandProc(as, arock) - char *arock; - struct cmd_syndesc *as; +CommandProc(struct cmd_syndesc *as, void *arock) { long code; int startServer = (as->parms[aSERVER].items != 0); @@ -310,7 +308,7 @@ main(argc, argv) exit(1); } #endif - ts = cmd_CreateSyntax(NULL, CommandProc, 0, + ts = cmd_CreateSyntax(NULL, CommandProc, NULL, "run Rx authentication stress test"); cmd_AddParm(ts, "-server", CMD_FLAG, CMD_OPTIONAL, "start server"); cmd_AddParm(ts, "-client", CMD_SINGLE, CMD_OPTIONAL, "start client"); diff --git a/src/scout/scout.c b/src/scout/scout.c index c408e3657..47b4cbce8 100644 --- a/src/scout/scout.c +++ b/src/scout/scout.c @@ -2210,10 +2210,7 @@ static void scout_AdoptThresholds(a_thresh_item) * Initializes this program. *------------------------------------------------------------------------*/ -static int scoutInit(as, arock) - struct cmd_syndesc *as; - char *arock; - +static int scoutInit(struct cmd_syndesc *as, void *arock) { /*scoutInit */ static char rn[] = "scoutInit"; /*Routine name */ @@ -2349,7 +2346,7 @@ main(argc, argv) /* * Set up the commands we understand. */ - ts = cmd_CreateSyntax("initcmd", scoutInit, 0, "initialize the program"); + ts = cmd_CreateSyntax("initcmd", scoutInit, NULL, "initialize the program"); cmd_AddParm(ts, "-server", CMD_LIST, CMD_REQUIRED, "FileServer name(s) to monitor"); cmd_AddParm(ts, "-basename", CMD_SINGLE, CMD_OPTIONAL, diff --git a/src/ubik/udebug.c b/src/ubik/udebug.c index 3412d7dfa..a7e5ab6cc 100644 --- a/src/ubik/udebug.c +++ b/src/ubik/udebug.c @@ -84,7 +84,7 @@ PortName(char *aname) } static int -CommandProc(struct cmd_syndesc *as, char *arock) +CommandProc(struct cmd_syndesc *as, void *arock) { char *hostName, *portName, *times; afs_int32 hostAddr; @@ -349,7 +349,7 @@ main(int argc, char **argv) nsa.sa_flags = SA_FULLDUMP; sigaction(SIGSEGV, &nsa, NULL); #endif - ts = cmd_CreateSyntax(NULL, CommandProc, 0, "probe ubik server"); + ts = cmd_CreateSyntax(NULL, CommandProc, NULL, "probe ubik server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server machine"); cmd_AddParm(ts, "-port", CMD_SINGLE, CMD_OPTIONAL, "IP port"); cmd_AddParm(ts, "-long", CMD_FLAG, CMD_OPTIONAL, "print all info"); diff --git a/src/uss/uss.c b/src/uss/uss.c index a0759e914..aaf3203f1 100644 --- a/src/uss/uss.c +++ b/src/uss/uss.c @@ -123,10 +123,8 @@ static int DoAdd(); * As advertised. *------------------------------------------------------------------------*/ -static afs_int32 -GetCommon(a_as) - register struct cmd_syndesc *a_as; - +static int +GetCommon(register struct cmd_syndesc *a_as, void *arock) { /*GetCommon */ int code; /*Result of ka_LocalCell */ @@ -370,10 +368,7 @@ DoDelete() *------------------------------------------------------------------------*/ static int -DelUser(a_as, a_rock) - struct cmd_syndesc *a_as; - char *a_rock; - +DelUser(struct cmd_syndesc *a_as, void *a_rock) { /*DelUser */ int code; @@ -467,10 +462,7 @@ DelUser(a_as, a_rock) *------------------------------------------------------------------------*/ static int -PurgeVolumes(a_as, a_rock) - struct cmd_syndesc *a_as; - char *a_rock; - +PurgeVolumes(struct cmd_syndesc *a_as, void *a_rock) { /*PurgeVolumes */ fprintf(stderr, "Sorry, purgevolumes has not yet been implemented.\n"); @@ -502,10 +494,7 @@ PurgeVolumes(a_as, a_rock) *------------------------------------------------------------------------*/ static int -RestoreUser(a_as, a_rock) - struct cmd_syndesc *a_as; - char *a_rock; - +RestoreUser(struct cmd_syndesc *a_as, void *a_rock) { /*RestoreUser */ fprintf(stderr, "Sorry, restoreuser has not yet been implemented.\n"); @@ -1317,10 +1306,7 @@ DoBulkExecLine(a_buf, a_tp) *------------------------------------------------------------------------*/ extern int Pipe; static int -HandleBulk(a_as, a_rock) - register struct cmd_syndesc *a_as; - char *a_rock; - +HandleBulk(register struct cmd_syndesc *a_as, void *a_rock) { /*HandleBulk */ #define USS_BULK_CMD_CHARS 128 @@ -1529,10 +1515,7 @@ HandleBulk(a_as, a_rock) *------------------------------------------------------------------------*/ static int -AddUser(a_as, a_rock) - register struct cmd_syndesc *a_as; - char *a_rock; - +AddUser(register struct cmd_syndesc *a_as, void *a_rock) { /*AddUser */ int i; @@ -1843,7 +1826,7 @@ main(argc, argv) /* ----------------------------- add ----------------------------- */ - cs = cmd_CreateSyntax("add", AddUser, 0, "create a new user account"); + cs = cmd_CreateSyntax("add", AddUser, NULL, "create a new user account"); cmd_AddParm(cs, "-user", CMD_SINGLE, 0, "login name"); cmd_AddParm(cs, "-realname", CMD_SINGLE, CMD_OPTIONAL, "full name in quotes"); @@ -1878,7 +1861,7 @@ main(argc, argv) /* ---------------------------- bulk ----------------------------- */ - cs = cmd_CreateSyntax("bulk", HandleBulk, 0, "bulk input mode"); + cs = cmd_CreateSyntax("bulk", HandleBulk, NULL, "bulk input mode"); cmd_AddParm(cs, "-file", CMD_SINGLE, 0, "bulk input file"); cmd_Seek(cs, AUSS_TEMPLATE); cmd_AddParm(cs, "-template", CMD_SINGLE, CMD_OPTIONAL, @@ -1903,7 +1886,7 @@ main(argc, argv) /* ---------------------------- delete --------------------------- */ - cs = cmd_CreateSyntax("delete", DelUser, 0, "delete a user account"); + cs = cmd_CreateSyntax("delete", DelUser, NULL, "delete a user account"); cmd_AddParm(cs, "-user", CMD_SINGLE, 0, "login name"); cmd_AddParm(cs, "-mountpoint", CMD_SINGLE, CMD_OPTIONAL, "mountpoint for user's volume"); @@ -1937,7 +1920,7 @@ main(argc, argv) #if USS_DONT_HIDE_SOME_FEATURES /* ------------------------- purgevolumes ------------------------ */ - cs = cmd_CreateSyntax("purgevolumes", PurgeVolumes, 0, + cs = cmd_CreateSyntax("purgevolumes", PurgeVolumes, NULL, "destroy a deleted user's volume"); cmd_AddParm(cs, "-volname", CMD_LIST, CMD_OPTIONAL | CMD_EXPANDS, "Name(s) of volume(s) to destroy"); @@ -1960,7 +1943,7 @@ main(argc, argv) #if USS_DONT_HIDE_SOME_FEATURES /* ---------------------------- restore -------------------------- */ - cs = cmd_CreateSyntax("restore", RestoreUser, 0, + cs = cmd_CreateSyntax("restore", RestoreUser, NULL, "restore a deleted user account"); cmd_AddParm(cs, "-user", CMD_SINGLE, 0, "login name to restore"); cmd_AddParm(cs, "-uid", CMD_SINGLE, 0, "user id number"); diff --git a/src/venus/cacheout.c b/src/venus/cacheout.c index 705f2ce19..58a33e6bd 100644 --- a/src/venus/cacheout.c +++ b/src/venus/cacheout.c @@ -63,9 +63,8 @@ struct rx_securityClass *junk; extern int VL_GetAddrs(); -afs_int32 -InvalidateCache(as) - struct cmd_syndesc *as; +static int +InvalidateCache(struct cmd_syndesc *as, void *arock) { afs_int32 code = 0; struct cmd_item *u; @@ -212,10 +211,10 @@ ListServers() return code; } -afs_int32 -GetServerList() +static int +GetServerList(struct cmd_syndesc *as, void *arock) { - afs_int32 code; + int code; int i; code = ListServers(); @@ -240,10 +239,8 @@ User enters lists of: Command is executed in user's cell. */ -static -MyBeforeProc(as, arock) - struct cmd_syndesc *as; - char *arock; +static int +MyBeforeProc(struct cmd_syndesc *as, void *arock) { register char *tcell = NULL; char confdir[200]; @@ -308,13 +305,13 @@ main(argc, argv) cmd_SetBeforeProc(MyBeforeProc, NULL); ts = cmd_CreateSyntax("initcmd" /*"invalidatecache" */ , InvalidateCache, - 0, "invalidate server ACL cache"); + NULL, "invalidate server ACL cache"); cmd_AddParm(ts, "-id", CMD_LIST, CMD_OPTIONAL, "user identifier"); cmd_AddParm(ts, "-ip", CMD_LIST, CMD_OPTIONAL, "IP address"); cmd_CreateAlias(ts, "ic"); cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cell name"); - ts = cmd_CreateSyntax("listservers", GetServerList, 0, + ts = cmd_CreateSyntax("listservers", GetServerList, NULL, "list servers in the cell"); cmd_CreateAlias(ts, "ls"); diff --git a/src/venus/cmdebug.c b/src/venus/cmdebug.c index c7d04182e..00c3ab167 100644 --- a/src/venus/cmdebug.c +++ b/src/venus/cmdebug.c @@ -461,7 +461,7 @@ PrintCacheEntries(struct rx_connection *aconn, int aint32) } int -CommandProc(struct cmd_syndesc *as, char *arock) +CommandProc(struct cmd_syndesc *as, void *arock) { struct rx_connection *conn; register char *hostName; @@ -551,7 +551,7 @@ main(int argc, char **argv) rx_Init(0); - ts = cmd_CreateSyntax(NULL, CommandProc, 0, "probe unik server"); + ts = cmd_CreateSyntax(NULL, CommandProc, NULL, "probe unik server"); cmd_AddParm(ts, "-servers", CMD_SINGLE, CMD_REQUIRED, "server machine"); cmd_AddParm(ts, "-port", CMD_SINGLE, CMD_OPTIONAL, "IP port"); cmd_AddParm(ts, "-long", CMD_FLAG, CMD_OPTIONAL, "print all info"); diff --git a/src/venus/fs.c b/src/venus/fs.c index 736309563..7432e2fa8 100644 --- a/src/venus/fs.c +++ b/src/venus/fs.c @@ -69,14 +69,13 @@ extern char *hostutil_GetNameByINet(); extern struct hostent *hostutil_GetHostByName(); -extern struct cmd_syndesc *cmd_CreateSyntax(); static char pn[] = "fs"; static int rxInitDone = 0; static void ZapList(); static int PruneList(); static CleanAcl(); -static SetVolCmd(); +static int SetVolCmd(struct cmd_syndesc *as, void *arock); static GetCellName(); static VLDBInit(); static void Die(); @@ -725,7 +724,7 @@ AclToString(struct Acl *acl) } static int -SetACLCmd(struct cmd_syndesc *as, char *arock) +SetACLCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -859,7 +858,7 @@ SetACLCmd(struct cmd_syndesc *as, char *arock) static int -CopyACLCmd(struct cmd_syndesc *as, char *arock) +CopyACLCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -1039,7 +1038,7 @@ CleanAcl(struct Acl *aa, char *fname) /* clean up an acl to not have bogus entries */ static int -CleanACLCmd(struct cmd_syndesc *as, char *arock) +CleanACLCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct Acl *ta = 0; @@ -1126,7 +1125,7 @@ CleanACLCmd(struct cmd_syndesc *as, char *arock) } static int -ListACLCmd(struct cmd_syndesc *as, char *arock) +ListACLCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct Acl *ta; @@ -1190,7 +1189,7 @@ ListACLCmd(struct cmd_syndesc *as, char *arock) } static int -GetCallerAccess(struct cmd_syndesc *as, char *arock) +GetCallerAccess(struct cmd_syndesc *as, void *arock) { struct cmd_item *ti; int error = 0; @@ -1217,7 +1216,7 @@ GetCallerAccess(struct cmd_syndesc *as, char *arock) } static int -FlushVolumeCmd(struct cmd_syndesc *as, char *arock) +FlushVolumeCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -1245,7 +1244,7 @@ FlushVolumeCmd(struct cmd_syndesc *as, char *arock) * CMD_OPTIONAL in the cmd_AddParam(-generate) call */ static int -UuidCmd(struct cmd_syndesc *as, char *arock) +UuidCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -1276,7 +1275,7 @@ UuidCmd(struct cmd_syndesc *as, char *arock) } static int -FlushCmd(struct cmd_syndesc *as, char *arock) +FlushCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -1303,17 +1302,17 @@ FlushCmd(struct cmd_syndesc *as, char *arock) /* all this command does is repackage its args and call SetVolCmd */ static int -SetQuotaCmd(struct cmd_syndesc *as, char *arock) +SetQuotaCmd(struct cmd_syndesc *as, void *arock) { struct cmd_syndesc ts; /* copy useful stuff from our command slot; we may later have to reorder */ memcpy(&ts, as, sizeof(ts)); /* copy whole thing */ - return SetVolCmd(&ts); + return SetVolCmd(&ts, arock); } static int -SetVolCmd(struct cmd_syndesc *as, char *arock) +SetVolCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -1377,7 +1376,7 @@ struct VenusFid { }; static int -ExamineCmd(struct cmd_syndesc *as, char *arock) +ExamineCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -1418,7 +1417,7 @@ ExamineCmd(struct cmd_syndesc *as, char *arock) } static int -ListQuotaCmd(struct cmd_syndesc *as, char *arock) +ListQuotaCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -1449,7 +1448,7 @@ ListQuotaCmd(struct cmd_syndesc *as, char *arock) } static int -WhereIsCmd(struct cmd_syndesc *as, char *arock) +WhereIsCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -1488,7 +1487,7 @@ WhereIsCmd(struct cmd_syndesc *as, char *arock) static int -DiskFreeCmd(struct cmd_syndesc *as, char *arock) +DiskFreeCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -1519,7 +1518,7 @@ DiskFreeCmd(struct cmd_syndesc *as, char *arock) } static int -QuotaCmd(struct cmd_syndesc *as, char *arock) +QuotaCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -1552,7 +1551,7 @@ QuotaCmd(struct cmd_syndesc *as, char *arock) } static int -ListMountCmd(struct cmd_syndesc *as, char *arock) +ListMountCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -1672,8 +1671,8 @@ ListMountCmd(struct cmd_syndesc *as, char *arock) return error; } -static -MakeMountCmd(struct cmd_syndesc *as, char *arock) +static int +MakeMountCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; char *cellName, *volName, *tmpName; @@ -1781,7 +1780,7 @@ defect #3069 * tp: Set to point to the actual name of the mount point to nuke. */ static int -RemoveMountCmd(struct cmd_syndesc *as, char *arock) +RemoveMountCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code = 0; struct ViceIoctl blob; @@ -1833,7 +1832,7 @@ RemoveMountCmd(struct cmd_syndesc *as, char *arock) */ static int -CheckServersCmd(struct cmd_syndesc *as, char *arock) +CheckServersCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -1932,7 +1931,7 @@ CheckServersCmd(struct cmd_syndesc *as, char *arock) } static int -MessagesCmd(struct cmd_syndesc *as, char *arock) +MessagesCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code = 0; struct ViceIoctl blob; @@ -1978,7 +1977,7 @@ MessagesCmd(struct cmd_syndesc *as, char *arock) } static int -CheckVolumesCmd(struct cmd_syndesc *as, char *arock) +CheckVolumesCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -1996,7 +1995,7 @@ CheckVolumesCmd(struct cmd_syndesc *as, char *arock) } static int -SetCacheSizeCmd(struct cmd_syndesc *as, char *arock) +SetCacheSizeCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -2035,7 +2034,7 @@ SetCacheSizeCmd(struct cmd_syndesc *as, char *arock) #define MAXGCSIZE 16 static int -GetCacheParmsCmd(struct cmd_syndesc *as, char *arock) +GetCacheParmsCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -2060,7 +2059,7 @@ GetCacheParmsCmd(struct cmd_syndesc *as, char *arock) } static int -ListCellsCmd(struct cmd_syndesc *as, char *arock) +ListCellsCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; afs_int32 i, j; @@ -2111,7 +2110,7 @@ ListCellsCmd(struct cmd_syndesc *as, char *arock) } static int -ListAliasesCmd(struct cmd_syndesc *as, char *arock) +ListAliasesCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code, i; char *tp, *aliasName, *realName; @@ -2141,7 +2140,7 @@ ListAliasesCmd(struct cmd_syndesc *as, char *arock) } static int -CallBackRxConnCmd(struct cmd_syndesc *as, char *arock) +CallBackRxConnCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -2180,7 +2179,7 @@ CallBackRxConnCmd(struct cmd_syndesc *as, char *arock) } static int -NewCellCmd(struct cmd_syndesc *as, char *arock) +NewCellCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code, linkedstate = 0, size = 0, *lp; struct ViceIoctl blob; @@ -2292,7 +2291,7 @@ NewCellCmd(struct cmd_syndesc *as, char *arock) } static int -NewAliasCmd(struct cmd_syndesc *as, char *arock) +NewAliasCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -2327,7 +2326,7 @@ NewAliasCmd(struct cmd_syndesc *as, char *arock) } static int -WhichCellCmd(struct cmd_syndesc *as, char *arock) +WhichCellCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct cmd_item *ti; @@ -2352,7 +2351,7 @@ WhichCellCmd(struct cmd_syndesc *as, char *arock) } static int -WSCellCmd(struct cmd_syndesc *as, char *arock) +WSCellCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -2382,7 +2381,7 @@ static PrimaryCellCmd(as) */ static int -MonitorCmd(struct cmd_syndesc *as, char *arock) +MonitorCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -2443,7 +2442,7 @@ MonitorCmd(struct cmd_syndesc *as, char *arock) } static int -SysNameCmd(struct cmd_syndesc *as, char *arock) +SysNameCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -2497,7 +2496,7 @@ SysNameCmd(struct cmd_syndesc *as, char *arock) static char *exported_types[] = { "null", "nfs", "" }; static int -ExportAfsCmd(struct cmd_syndesc *as, char *arock) +ExportAfsCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -2596,7 +2595,7 @@ ExportAfsCmd(struct cmd_syndesc *as, char *arock) static int -GetCellCmd(struct cmd_syndesc *as, char *arock) +GetCellCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -2647,7 +2646,7 @@ GetCellCmd(struct cmd_syndesc *as, char *arock) } static int -SetCellCmd(struct cmd_syndesc *as, char *arock) +SetCellCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -2831,7 +2830,7 @@ addServer(char *name, afs_int32 rank) static int -SetPrefCmd(struct cmd_syndesc *as, char *arock) +SetPrefCmd(struct cmd_syndesc *as, void *arock) { FILE *infd; afs_int32 code; @@ -2937,7 +2936,7 @@ SetPrefCmd(struct cmd_syndesc *as, char *arock) static int -GetPrefCmd(struct cmd_syndesc *as, char *arock) +GetPrefCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct cmd_item *ti; @@ -3007,7 +3006,7 @@ GetPrefCmd(struct cmd_syndesc *as, char *arock) } static int -StoreBehindCmd(struct cmd_syndesc *as, char *arock) +StoreBehindCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code = 0; struct ViceIoctl blob; @@ -3107,8 +3106,8 @@ StoreBehindCmd(struct cmd_syndesc *as, char *arock) } -static afs_int32 -SetCryptCmd(struct cmd_syndesc *as, char *arock) +static int +SetCryptCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code = 0, flag; struct ViceIoctl blob; @@ -3134,8 +3133,8 @@ SetCryptCmd(struct cmd_syndesc *as, char *arock) } -static afs_int32 -GetCryptCmd(struct cmd_syndesc *as, char *arock) +static int +GetCryptCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code = 0, flag; struct ViceIoctl blob; @@ -3186,17 +3185,17 @@ main(int argc, char **argv) #endif /* try to find volume location information */ - ts = cmd_CreateSyntax("getclientaddrs", GetClientAddrsCmd, 0, + ts = cmd_CreateSyntax("getclientaddrs", GetClientAddrsCmd, NULL, "get client network interface addresses"); cmd_CreateAlias(ts, "gc"); - ts = cmd_CreateSyntax("setclientaddrs", SetClientAddrsCmd, 0, + ts = cmd_CreateSyntax("setclientaddrs", SetClientAddrsCmd, NULL, "set client network interface addresses"); cmd_AddParm(ts, "-address", CMD_LIST, CMD_OPTIONAL | CMD_EXPANDS, "client network interfaces"); cmd_CreateAlias(ts, "sc"); - ts = cmd_CreateSyntax("setserverprefs", SetPrefCmd, 0, + ts = cmd_CreateSyntax("setserverprefs", SetPrefCmd, NULL, "set server ranks"); cmd_AddParm(ts, "-servers", CMD_LIST, CMD_OPTIONAL | CMD_EXPANDS, "fileserver names and ranks"); @@ -3207,7 +3206,7 @@ main(int argc, char **argv) cmd_AddParm(ts, "-stdin", CMD_FLAG, CMD_OPTIONAL, "input from stdin"); cmd_CreateAlias(ts, "sp"); - ts = cmd_CreateSyntax("getserverprefs", GetPrefCmd, 0, + ts = cmd_CreateSyntax("getserverprefs", GetPrefCmd, NULL, "get server ranks"); cmd_AddParm(ts, "-file", CMD_SINGLE, CMD_OPTIONAL, "output to named file"); @@ -3216,7 +3215,7 @@ main(int argc, char **argv) /* cmd_AddParm(ts, "-cell", CMD_FLAG, CMD_OPTIONAL, "cellname"); */ cmd_CreateAlias(ts, "gp"); - ts = cmd_CreateSyntax("setacl", SetACLCmd, 0, "set access control list"); + ts = cmd_CreateSyntax("setacl", SetACLCmd, NULL, "set access control list"); cmd_AddParm(ts, "-dir", CMD_LIST, 0, "directory"); cmd_AddParm(ts, "-acl", CMD_LIST, 0, "access list entries"); cmd_AddParm(ts, "-clear", CMD_FLAG, CMD_OPTIONAL, "clear access list"); @@ -3229,7 +3228,7 @@ main(int argc, char **argv) "initial file acl (DFS only)"); cmd_CreateAlias(ts, "sa"); - ts = cmd_CreateSyntax("listacl", ListACLCmd, 0, + ts = cmd_CreateSyntax("listacl", ListACLCmd, NULL, "list access control list"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); parm_listacl_id = ts->nParms; @@ -3237,16 +3236,16 @@ main(int argc, char **argv) cmd_AddParm(ts, "-if", CMD_FLAG, CMD_OPTIONAL, "initial file acl"); cmd_CreateAlias(ts, "la"); - ts = cmd_CreateSyntax("getcalleraccess", GetCallerAccess, 0, + ts = cmd_CreateSyntax("getcalleraccess", GetCallerAccess, NULL, "list callers access"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); cmd_CreateAlias(ts, "gca"); - ts = cmd_CreateSyntax("cleanacl", CleanACLCmd, 0, + ts = cmd_CreateSyntax("cleanacl", CleanACLCmd, NULL, "clean up access control list"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); - ts = cmd_CreateSyntax("copyacl", CopyACLCmd, 0, + ts = cmd_CreateSyntax("copyacl", CopyACLCmd, NULL, "copy access control list"); cmd_AddParm(ts, "-fromdir", CMD_SINGLE, 0, "source directory (or DFS file)"); @@ -3260,13 +3259,13 @@ main(int argc, char **argv) cmd_CreateAlias(ts, "ca"); - ts = cmd_CreateSyntax("flush", FlushCmd, 0, "flush file from cache"); + ts = cmd_CreateSyntax("flush", FlushCmd, NULL, "flush file from cache"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); - ts = cmd_CreateSyntax("flushmount", FlushMountCmd, 0, + ts = cmd_CreateSyntax("flushmount", FlushMountCmd, NULL, "flush mount symlink from cache"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); - ts = cmd_CreateSyntax("setvol", SetVolCmd, 0, "set volume status"); + ts = cmd_CreateSyntax("setvol", SetVolCmd, NULL, "set volume status"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); cmd_AddParm(ts, "-max", CMD_SINGLE, CMD_OPTIONAL, "disk space quota in 1K units"); @@ -3279,32 +3278,32 @@ main(int argc, char **argv) "offline message"); cmd_CreateAlias(ts, "sv"); - ts = cmd_CreateSyntax("messages", MessagesCmd, 0, + ts = cmd_CreateSyntax("messages", MessagesCmd, NULL, "control Cache Manager messages"); cmd_AddParm(ts, "-show", CMD_SINGLE, CMD_OPTIONAL, "[user|console|all|none]"); - ts = cmd_CreateSyntax("examine", ExamineCmd, 0, "display file/volume status"); + ts = cmd_CreateSyntax("examine", ExamineCmd, NULL, "display file/volume status"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); cmd_CreateAlias(ts, "lv"); cmd_CreateAlias(ts, "listvol"); - ts = cmd_CreateSyntax("listquota", ListQuotaCmd, 0, "list volume quota"); + ts = cmd_CreateSyntax("listquota", ListQuotaCmd, NULL, "list volume quota"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); cmd_CreateAlias(ts, "lq"); - ts = cmd_CreateSyntax("diskfree", DiskFreeCmd, 0, + ts = cmd_CreateSyntax("diskfree", DiskFreeCmd, NULL, "show server disk space usage"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); cmd_CreateAlias(ts, "df"); - ts = cmd_CreateSyntax("quota", QuotaCmd, 0, "show volume quota usage"); + ts = cmd_CreateSyntax("quota", QuotaCmd, NULL, "show volume quota usage"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); - ts = cmd_CreateSyntax("lsmount", ListMountCmd, 0, "list mount point"); + ts = cmd_CreateSyntax("lsmount", ListMountCmd, NULL, "list mount point"); cmd_AddParm(ts, "-dir", CMD_LIST, 0, "directory"); - ts = cmd_CreateSyntax("mkmount", MakeMountCmd, 0, "make mount point"); + ts = cmd_CreateSyntax("mkmount", MakeMountCmd, NULL, "make mount point"); cmd_AddParm(ts, "-dir", CMD_SINGLE, 0, "directory"); cmd_AddParm(ts, "-vol", CMD_SINGLE, 0, "volume name"); cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cell name"); @@ -3320,10 +3319,10 @@ defect 3069 */ - ts = cmd_CreateSyntax("rmmount", RemoveMountCmd, 0, "remove mount point"); + ts = cmd_CreateSyntax("rmmount", RemoveMountCmd, NULL, "remove mount point"); cmd_AddParm(ts, "-dir", CMD_LIST, 0, "directory"); - ts = cmd_CreateSyntax("checkservers", CheckServersCmd, 0, + ts = cmd_CreateSyntax("checkservers", CheckServersCmd, NULL, "check local cell's servers"); cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cell to check"); cmd_AddParm(ts, "-all", CMD_FLAG, CMD_OPTIONAL, "check all cells"); @@ -3332,12 +3331,12 @@ defect 3069 cmd_AddParm(ts, "-interval", CMD_SINGLE, CMD_OPTIONAL, "seconds between probes"); - ts = cmd_CreateSyntax("checkvolumes", CheckVolumesCmd, 0, + ts = cmd_CreateSyntax("checkvolumes", CheckVolumesCmd, NULL, "check volumeID/name mappings"); cmd_CreateAlias(ts, "checkbackups"); - ts = cmd_CreateSyntax("setcachesize", SetCacheSizeCmd, 0, + ts = cmd_CreateSyntax("setcachesize", SetCacheSizeCmd, NULL, "set cache size"); cmd_AddParm(ts, "-blocks", CMD_SINGLE, CMD_OPTIONAL, "size in 1K byte blocks (0 => reset)"); @@ -3364,13 +3363,13 @@ defect 3069 #endif cmd_CreateAlias(ts, "sq"); - ts = cmd_CreateSyntax("newcell", NewCellCmd, 0, "configure new cell"); + ts = cmd_CreateSyntax("newcell", NewCellCmd, NULL, "configure new cell"); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "cell name"); cmd_AddParm(ts, "-servers", CMD_LIST, CMD_REQUIRED, "primary servers"); cmd_AddParm(ts, "-linkedcell", CMD_SINGLE, CMD_OPTIONAL, "linked cell name"); - ts = cmd_CreateSyntax("newalias", NewAliasCmd, 0, + ts = cmd_CreateSyntax("newalias", NewAliasCmd, NULL, "configure new cell alias"); cmd_AddParm(ts, "-alias", CMD_SINGLE, 0, "alias name"); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "real name of cell"); @@ -3388,42 +3387,42 @@ defect 3069 "cell's vldb server port"); #endif - ts = cmd_CreateSyntax("whichcell", WhichCellCmd, 0, "list file's cell"); + ts = cmd_CreateSyntax("whichcell", WhichCellCmd, NULL, "list file's cell"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); - ts = cmd_CreateSyntax("whereis", WhereIsCmd, 0, "list file's location"); + ts = cmd_CreateSyntax("whereis", WhereIsCmd, NULL, "list file's location"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); - ts = cmd_CreateSyntax("wscell", WSCellCmd, 0, "list workstation's cell"); + ts = cmd_CreateSyntax("wscell", WSCellCmd, NULL, "list workstation's cell"); /* - ts = cmd_CreateSyntax("primarycell", PrimaryCellCmd, 0, "obsolete (listed primary cell)"); + ts = cmd_CreateSyntax("primarycell", PrimaryCellCmd, NULL, "obsolete (listed primary cell)"); */ /* set cache monitor host address */ - ts = cmd_CreateSyntax("monitor", MonitorCmd, 0, (char *)CMD_HIDDEN); + ts = cmd_CreateSyntax("monitor", MonitorCmd, NULL, (char *)CMD_HIDDEN); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "host name or 'off'"); cmd_CreateAlias(ts, "mariner"); - ts = cmd_CreateSyntax("getcellstatus", GetCellCmd, 0, "get cell status"); + ts = cmd_CreateSyntax("getcellstatus", GetCellCmd, NULL, "get cell status"); cmd_AddParm(ts, "-cell", CMD_LIST, 0, "cell name"); - ts = cmd_CreateSyntax("setcell", SetCellCmd, 0, "set cell status"); + ts = cmd_CreateSyntax("setcell", SetCellCmd, NULL, "set cell status"); cmd_AddParm(ts, "-cell", CMD_LIST, 0, "cell name"); cmd_AddParm(ts, "-suid", CMD_FLAG, CMD_OPTIONAL, "allow setuid programs"); cmd_AddParm(ts, "-nosuid", CMD_FLAG, CMD_OPTIONAL, "disallow setuid programs"); - ts = cmd_CreateSyntax("flushvolume", FlushVolumeCmd, 0, + ts = cmd_CreateSyntax("flushvolume", FlushVolumeCmd, NULL, "flush all data in volume"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); - ts = cmd_CreateSyntax("sysname", SysNameCmd, 0, + ts = cmd_CreateSyntax("sysname", SysNameCmd, NULL, "get/set sysname (i.e. @sys) value"); cmd_AddParm(ts, "-newsys", CMD_LIST, CMD_OPTIONAL, "new sysname"); - ts = cmd_CreateSyntax("exportafs", ExportAfsCmd, 0, + ts = cmd_CreateSyntax("exportafs", ExportAfsCmd, NULL, "enable/disable translators to AFS"); cmd_AddParm(ts, "-type", CMD_SINGLE, 0, "exporter name"); cmd_AddParm(ts, "-start", CMD_SINGLE, CMD_OPTIONAL, @@ -3436,7 +3435,7 @@ defect 3069 "allow nfs mounts to subdirs of /afs/.. (on | off)"); - ts = cmd_CreateSyntax("storebehind", StoreBehindCmd, 0, + ts = cmd_CreateSyntax("storebehind", StoreBehindCmd, NULL, "store to server after file close"); cmd_AddParm(ts, "-kbytes", CMD_SINGLE, CMD_OPTIONAL, "asynchrony for specified names"); @@ -3528,7 +3527,7 @@ Die(int errnum, char *filename) /* get clients interface addresses */ static int -GetClientAddrsCmd(struct cmd_syndesc *as, char *arock) +GetClientAddrsCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct cmd_item *ti; @@ -3574,7 +3573,7 @@ GetClientAddrsCmd(struct cmd_syndesc *as, char *arock) } static int -SetClientAddrsCmd(struct cmd_syndesc *as, char *arock) +SetClientAddrsCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code, addr; struct cmd_item *ti; @@ -3648,7 +3647,7 @@ SetClientAddrsCmd(struct cmd_syndesc *as, char *arock) } static int -FlushMountCmd(struct cmd_syndesc *as, char *arock) +FlushMountCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -3764,7 +3763,7 @@ FlushMountCmd(struct cmd_syndesc *as, char *arock) } static int -RxStatProcCmd(struct cmd_syndesc *as, char *arock) +RxStatProcCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; afs_int32 flags = 0; @@ -3799,7 +3798,7 @@ RxStatProcCmd(struct cmd_syndesc *as, char *arock) } static int -RxStatPeerCmd(struct cmd_syndesc *as, char *arock) +RxStatPeerCmd(struct cmd_syndesc *as, void *arock) { afs_int32 code; afs_int32 flags = 0; @@ -3834,7 +3833,7 @@ RxStatPeerCmd(struct cmd_syndesc *as, char *arock) } static int -GetFidCmd(struct cmd_syndesc *as, char *arock) +GetFidCmd(struct cmd_syndesc *as, void *arock) { struct ViceIoctl blob; struct cmd_item *ti; diff --git a/src/venus/fstrace.c b/src/venus/fstrace.c index fc6e4ce59..99bfaba0e 100644 --- a/src/venus/fstrace.c +++ b/src/venus/fstrace.c @@ -2703,10 +2703,8 @@ GetBulkLogInfo() } -static -DoDump(as, arock) - register struct cmd_syndesc *as; - char *arock; +static int +DoDump(struct cmd_syndesc *as, void *arock) { afs_int32 code = 0; afs_int32 tcode; @@ -2782,7 +2780,7 @@ SetUpDump() struct cmd_syndesc *dumpSyntax; dumpSyntax = - cmd_CreateSyntax("dump", DoDump, (char *)NULL, "dump AFS trace logs"); + cmd_CreateSyntax("dump", DoDump, NULL, "dump AFS trace logs"); (void)cmd_AddParm(dumpSyntax, "-set", CMD_LIST, CMD_OPTIONAL, "set_name"); (void)cmd_AddParm(dumpSyntax, "-follow", CMD_SINGLE, CMD_OPTIONAL, "log_name"); @@ -2792,10 +2790,8 @@ SetUpDump() "seconds_between_reads"); } -static -DoShowLog(as, arock) - register struct cmd_syndesc *as; - char *arock; +static int +DoShowLog(register struct cmd_syndesc *as, void *arock) { afs_int32 retVal = 0; afs_int32 code = 0; @@ -2858,17 +2854,15 @@ SetUpShowLog() struct cmd_syndesc *showSyntax; showSyntax = - cmd_CreateSyntax("lslog", DoShowLog, (char *)NULL, + cmd_CreateSyntax("lslog", DoShowLog, NULL, "list available logs"); (void)cmd_AddParm(showSyntax, "-set", CMD_LIST, CMD_OPTIONAL, "set_name"); (void)cmd_AddParm(showSyntax, "-log", CMD_LIST, CMD_OPTIONAL, "log_name"); (void)cmd_AddParm(showSyntax, "-long", CMD_FLAG, CMD_OPTIONAL, ""); } -static -DoShowSet(as, arock) - register struct cmd_syndesc *as; - char *arock; +static int +DoShowSet(register struct cmd_syndesc *as, void *arock) { afs_int32 retVal = 0; afs_int32 code = 0; @@ -2916,15 +2910,13 @@ SetUpShowSet() struct cmd_syndesc *showSyntax; showSyntax = - cmd_CreateSyntax("lsset", DoShowSet, (char *)NULL, + cmd_CreateSyntax("lsset", DoShowSet, NULL, "list available event sets"); (void)cmd_AddParm(showSyntax, "-set", CMD_LIST, CMD_OPTIONAL, "set_name"); } -static -DoClear(as, arock) - register struct cmd_syndesc *as; - char *arock; +static int +DoClear(register struct cmd_syndesc *as, void *arock) { afs_int32 retVal = 0; afs_int32 code = 0; @@ -2975,7 +2967,7 @@ SetUpClear() struct cmd_syndesc *clearSyntax; clearSyntax = - cmd_CreateSyntax("clear", DoClear, (char *)NULL, + cmd_CreateSyntax("clear", DoClear, NULL, "clear logs by logname or by event set"); (void)cmd_AddParm(clearSyntax, "-set", CMD_LIST, CMD_OPTIONAL, "set_name"); @@ -2983,10 +2975,8 @@ SetUpClear() "log_name"); } -static -DoSet(as, arock) - register struct cmd_syndesc *as; - char *arock; +static int +DoSet(register struct cmd_syndesc *as, void *arock) { afs_int32 retVal = 0; afs_int32 code = 0; @@ -3064,7 +3054,7 @@ SetUpSet() struct cmd_syndesc *setSyntax; setSyntax = - cmd_CreateSyntax("setset", DoSet, (char *)NULL, + cmd_CreateSyntax("setset", DoSet, NULL, "set state of event sets"); (void)cmd_AddParm(setSyntax, "-set", CMD_LIST, CMD_OPTIONAL, "set_name"); (void)cmd_AddParm(setSyntax, "-active", CMD_FLAG, CMD_OPTIONAL, ""); @@ -3072,10 +3062,8 @@ SetUpSet() (void)cmd_AddParm(setSyntax, "-dormant", CMD_FLAG, CMD_OPTIONAL, ""); } -static -DoResize(as, arock) - register struct cmd_syndesc *as; - char *arock; +static int +DoResize(register struct cmd_syndesc *as, void *arock) { afs_int32 retVal = 0; afs_int32 code = 0; @@ -3123,7 +3111,7 @@ SetUpResize() struct cmd_syndesc *setsizeSyntax; setsizeSyntax = - cmd_CreateSyntax("setlog", DoResize, (char *)NULL, + cmd_CreateSyntax("setlog", DoResize, NULL, "set the size of a log"); (void)cmd_AddParm(setsizeSyntax, "-log", CMD_LIST, CMD_OPTIONAL, "log_name"); diff --git a/src/venus/kdump.c b/src/venus/kdump.c index 33e637288..8dea1e38c 100644 --- a/src/venus/kdump.c +++ b/src/venus/kdump.c @@ -556,9 +556,6 @@ void print_cmstats(); -#ifndef AFS_KDUMP_LIB -extern struct cmd_syndesc *cmd_CreateSyntax(); -#endif int opencore(); #if defined(AFS_HPUX_ENV) && defined(__LP64__) @@ -828,10 +825,8 @@ symsrch(s) #ifndef AFS_KDUMP_LIB -static -cmdproc(as, arock) - register struct cmd_syndesc *as; - afs_int32 arock; +static int +cmdproc(register struct cmd_syndesc *as, void *arock) { register afs_int32 code = 0; @@ -957,7 +952,7 @@ main(argc, argv) sigaction(SIGSEGV, &nsa, NULL); #endif - ts = cmd_CreateSyntax(NULL, cmdproc, 0, + ts = cmd_CreateSyntax(NULL, cmdproc, NULL, "Read internal cache manager structs"); cmd_AddParm(ts, "-kobj", CMD_SINGLE, CMD_OPTIONAL, "kernel object (default /vmunix)"); diff --git a/src/venus/test/getinitparams.c b/src/venus/test/getinitparams.c index e720698a6..89f4800fe 100644 --- a/src/venus/test/getinitparams.c +++ b/src/venus/test/getinitparams.c @@ -34,7 +34,7 @@ RCSID int -GetInitParamsCmd(struct cmd_syndesc *as) +GetInitParamsCmd(struct cmd_syndesc *as, void *arock) { struct cm_initparams cm_initParams; struct ViceIoctl blob; diff --git a/src/venus/twiddle.c b/src/venus/twiddle.c index 3a1820360..fde4df643 100644 --- a/src/venus/twiddle.c +++ b/src/venus/twiddle.c @@ -32,7 +32,7 @@ RCSID #include "afs/prs_fs.h" #include #include > -#include #include #include #include @@ -47,13 +47,11 @@ static char tspace[1024]; static struct ubik_client *uclient; -extern struct cmd_syndesc *cmd_CreateSyntax(); static char pn[] = "fs"; static int rxInitDone = 0; -static -Twiddle(as) - struct cmd_syndesc *as; +static int +Twiddle(struct cmd_syndesc *as, void *arock) { afs_int32 code; struct ViceIoctl blob; @@ -154,7 +152,7 @@ main(argc, argv) /* try to find volume location information */ - ts = cmd_CreateSyntax(NULL, Twiddle, 0, "adjust rx parms"); + ts = cmd_CreateSyntax(NULL, Twiddle, NULL, "adjust rx parms"); cmd_AddParm(ts, "-initReceiveWindow ", CMD_SINGLE, CMD_OPTIONAL, "16"); cmd_AddParm(ts, "-maxReceiveWindow ", CMD_SINGLE, CMD_OPTIONAL, "16"); cmd_AddParm(ts, "-initSendWindow ", CMD_SINGLE, CMD_OPTIONAL, "8"); diff --git a/src/venus/whatfid.c b/src/venus/whatfid.c index c6737e24e..c076c0277 100644 --- a/src/venus/whatfid.c +++ b/src/venus/whatfid.c @@ -50,8 +50,7 @@ void PioctlError(); int WhatFidCmd_FileParm; int WhatFidCmd_FollowLinkParm; int -WhatFidCmd(as) - register struct cmd_syndesc *as; +WhatFidCmd(register struct cmd_syndesc *as, void *arock) { register afs_int32 code; struct ViceIoctl blob; @@ -105,7 +104,7 @@ main(argc, argv) pn = argv[0]; - ts = cmd_CreateSyntax("initcmd", WhatFidCmd, 0, "list fid for file(s)"); + ts = cmd_CreateSyntax("initcmd", WhatFidCmd, NULL, "list fid for file(s)"); WhatFidCmd_FileParm = cmd_AddParm(ts, "-path", CMD_LIST, 0, "pathnames"); WhatFidCmd_FollowLinkParm = cmd_AddParm(ts, "-link", CMD_FLAG, CMD_OPTIONAL, diff --git a/src/vlserver/cnvldb.c b/src/vlserver/cnvldb.c index 237d0fd7a..5a2028df1 100644 --- a/src/vlserver/cnvldb.c +++ b/src/vlserver/cnvldb.c @@ -33,7 +33,6 @@ RCSID #define BADSERVERID 255 /* XXX */ -extern struct cmd_syndesc *cmd_CreateSyntax(); static char pn[] = "cnvldb"; static char tempname[] = "XXnewvldb"; static char space[MAXSIZE]; @@ -67,9 +66,8 @@ afs_int32 dbsize; char *pathname = NULL; const char *dbPath; -static -handleit(as) - struct cmd_syndesc *as; +static int +handleit(struct cmd_syndesc *as, void *arock) { register struct cmd_item *ti; register afs_int32 code; @@ -990,7 +988,7 @@ main(argc, argv) register struct cmd_syndesc *ts; afs_int32 code; - ts = cmd_CreateSyntax("initcmd", handleit, 0, "optional"); + ts = cmd_CreateSyntax("initcmd", handleit, NULL, "optional"); cmd_AddParm(ts, "-to", CMD_SINGLE, CMD_OPTIONAL, "goal version"); cmd_AddParm(ts, "-from", CMD_SINGLE, CMD_OPTIONAL, "current version"); cmd_AddParm(ts, "-path", CMD_SINGLE, CMD_OPTIONAL, "pathname"); diff --git a/src/vlserver/sascnvldb.c b/src/vlserver/sascnvldb.c index a0802ef6f..e54cdcc08 100644 --- a/src/vlserver/sascnvldb.c +++ b/src/vlserver/sascnvldb.c @@ -21,6 +21,7 @@ RCSID #include "cnvldb.h" /* CHANGEME! */ #include #include +#include #ifdef notdef #include @@ -37,7 +38,6 @@ RCSID #define MAXSIZE 2048 /* most I'll get back from PIOCTL */ -extern struct cmd_syndesc *cmd_CreateSyntax(); static char pn[] = "cnvldb"; static char tempname[] = "XXnewvldb"; static char space[MAXSIZE]; @@ -149,9 +149,8 @@ QuickPrintStatus(status, name) } -static -ListQuotaCmd(as) - register struct cmd_syndesc *as; +static int +ListQuotaCmd(register struct cmd_syndesc *as, void *arock) { register afs_int32 code; struct ViceIoctl blob; diff --git a/src/vlserver/vlclient.c b/src/vlserver/vlclient.c index 3ef0e47f5..fff95ed3e 100644 --- a/src/vlserver/vlclient.c +++ b/src/vlserver/vlclient.c @@ -185,9 +185,8 @@ GetServer(char *aname) } -static -handleit(as) - struct cmd_syndesc *as; +static int +handleit(struct cmd_syndesc *as, void *arock) { register struct cmd_item *ti; register afs_int32 code, server = 0, sawserver = 0; @@ -1031,7 +1030,7 @@ main(argc, argv) afs_int32 code; strcpy(confdir, AFSDIR_CLIENT_ETC_DIRPATH); - ts = cmd_CreateSyntax("initcmd", handleit, 0, "initialize the program"); + ts = cmd_CreateSyntax("initcmd", handleit, NULL, "initialize the program"); cmd_AddParm(ts, "-cellpath", CMD_LIST, CMD_OPTIONAL, "Cell configuration directory"); cmd_AddParm(ts, "-server", CMD_LIST, CMD_OPTIONAL, diff --git a/src/vlserver/vldb_check.c b/src/vlserver/vldb_check.c index 7177beba9..1460577ce 100644 --- a/src/vlserver/vldb_check.c +++ b/src/vlserver/vldb_check.c @@ -1027,7 +1027,7 @@ FixBad(afs_uint32 idx, afs_uint32 addr, afs_uint32 type, afs_uint32 tmp, } int -WorkerBee(struct cmd_syndesc *as, char *arock) +WorkerBee(struct cmd_syndesc *as, void *arock) { char *dbfile; afs_int32 maxentries, type, tmp; diff --git a/src/vol/vol-bless.c b/src/vol/vol-bless.c index 925315b2f..f7bc37258 100644 --- a/src/vol/vol-bless.c +++ b/src/vol/vol-bless.c @@ -28,7 +28,7 @@ RCSID int VolumeChanged; /* to keep physio happy */ static int -handleit(struct cmd_syndesc *as, char *arock) +handleit(struct cmd_syndesc *as, void *arock) { Volume *vp; Error ec; @@ -73,7 +73,7 @@ main(int argc, char **argv) register struct cmd_syndesc *ts; afs_int32 code; - ts = cmd_CreateSyntax(NULL, handleit, 0, "Manipulate volume blessed bit"); + ts = cmd_CreateSyntax(NULL, handleit, NULL, "Manipulate volume blessed bit"); cmd_AddParm(ts, "-id", CMD_SINGLE, CMD_REQUIRED, "Volume id"); cmd_AddParm(ts, "-bless", CMD_FLAG, CMD_OPTIONAL, "Set blessed bit"); cmd_AddParm(ts, "-unbless", CMD_FLAG, CMD_OPTIONAL, "Clear blessed bit"); diff --git a/src/vol/vol-info.c b/src/vol/vol-info.c index 836f50bec..024d88313 100644 --- a/src/vol/vol-info.c +++ b/src/vol/vol-info.c @@ -217,7 +217,7 @@ AttachVolume(struct DiskPartition * dp, char *volname, static int -handleit(struct cmd_syndesc *as) +handleit(struct cmd_syndesc *as, void *arock) { register struct cmd_item *ti; int err = 0; @@ -622,7 +622,7 @@ main(int argc, char **argv) register struct cmd_syndesc *ts; afs_int32 code; - ts = cmd_CreateSyntax(NULL, handleit, 0, "Dump volume's internal state"); + ts = cmd_CreateSyntax(NULL, handleit, NULL, "Dump volume's internal state"); cmd_AddParm(ts, "-online", CMD_FLAG, CMD_OPTIONAL, "Get info from running fileserver"); cmd_AddParm(ts, "-vnode", CMD_FLAG, CMD_OPTIONAL, "Dump vnode info"); diff --git a/src/volser/restorevol.c b/src/volser/restorevol.c index c4041149b..df8e3a179 100644 --- a/src/volser/restorevol.c +++ b/src/volser/restorevol.c @@ -788,9 +788,8 @@ ReadVNode(count) return ((afs_int32) tag); } -WorkerBee(as, arock) - struct cmd_syndesc *as; - char *arock; +static int +WorkerBee(struct cmd_syndesc *as, void *arock) { int code = 0, c, len; afs_int32 type, count, vcount; diff --git a/src/volser/vol-dump.c b/src/volser/vol-dump.c index 39a1edd50..28f25e4a6 100644 --- a/src/volser/vol-dump.c +++ b/src/volser/vol-dump.c @@ -166,7 +166,7 @@ AttachVolume(struct DiskPartition * dp, char *volname, static int -handleit(struct cmd_syndesc *as, char *arock) +handleit(struct cmd_syndesc *as, void *arock) { register struct cmd_item *ti; int err = 0; @@ -291,7 +291,7 @@ main(int argc, char **argv) VInitVolumePackage(volumeUtility, 5, 5, DONT_CONNECT_FS, 0); - ts = cmd_CreateSyntax(NULL, handleit, 0, + ts = cmd_CreateSyntax(NULL, handleit, NULL, "Dump a volume to a 'vos dump' format file without using volserver"); cmd_AddParm(ts, "-part", CMD_LIST, CMD_OPTIONAL, "AFS partition name"); cmd_AddParm(ts, "-volumeid", CMD_LIST, CMD_OPTIONAL, "Volume id"); diff --git a/src/volser/vos.c b/src/volser/vos.c index 145b34b16..83710cb53 100644 --- a/src/volser/vos.c +++ b/src/volser/vos.c @@ -1457,9 +1457,8 @@ VolumeStats(pntr, entry, server, part, voltype) } /* command to forcibly remove a volume */ -static -NukeVolume(as) - register struct cmd_syndesc *as; +static int +NukeVolume(register struct cmd_syndesc *as) { register afs_int32 code; afs_int32 volID, err; @@ -1523,9 +1522,8 @@ NukeVolume(as) * As advertised. *------------------------------------------------------------------------ */ -static -ExamineVolume(as) - register struct cmd_syndesc *as; +static int +ExamineVolume(register struct cmd_syndesc *as, void *arock) { struct nvldbentry entry; afs_int32 vcode = 0; @@ -1676,9 +1674,8 @@ ExamineVolume(as) * As advertised. *------------------------------------------------------------------------ */ -static -SetFields(as) - register struct cmd_syndesc *as; +static int +SetFields(register struct cmd_syndesc *as, void *arock) { struct nvldbentry entry; afs_int32 vcode = 0; @@ -1757,9 +1754,8 @@ SetFields(as) * As advertised. *------------------------------------------------------------------------ */ -static -volOnline(as) - register struct cmd_syndesc *as; +static int +volOnline(register struct cmd_syndesc *as, void *arock) { afs_int32 server, partition, volid; afs_int32 code, err = 0; @@ -1818,7 +1814,7 @@ volOnline(as) *------------------------------------------------------------------------ */ static int -volOffline(register struct cmd_syndesc *as) +volOffline(register struct cmd_syndesc *as, void *arock) { afs_int32 server, partition, volid; afs_int32 code, err = 0; @@ -1868,7 +1864,7 @@ volOffline(register struct cmd_syndesc *as) } static int -CreateVolume(register struct cmd_syndesc *as) +CreateVolume(register struct cmd_syndesc *as, void *arock) { afs_int32 pnum; char part[10]; @@ -1976,9 +1972,8 @@ DeleteAll(entry) return error; } -static -DeleteVolume(as) - struct cmd_syndesc *as; +static int +DeleteVolume(struct cmd_syndesc *as, void *arock) { afs_int32 err, code = 0; afs_int32 server = 0, partition = -1, volid; @@ -2098,8 +2093,7 @@ DeleteVolume(as) #define TESTM 0 /* set for move space tests, clear for production */ static -MoveVolume(as) - register struct cmd_syndesc *as; +MoveVolume(register struct cmd_syndesc *as, void *arock) { afs_int32 volid, fromserver, toserver, frompart, topart; @@ -2225,9 +2219,8 @@ MoveVolume(as) return 0; } -static -CopyVolume(as) - register struct cmd_syndesc *as; +static int +CopyVolume(register struct cmd_syndesc *as, void *arock) { afs_int32 volid, fromserver, toserver, frompart, topart, code, err, flags; char fromPartName[10], toPartName[10], *tovolume; @@ -2372,9 +2365,8 @@ CopyVolume(as) } -static -ShadowVolume(as) - register struct cmd_syndesc *as; +static int +ShadowVolume(register struct cmd_syndesc *as, void *arock) { afs_int32 volid, fromserver, toserver, frompart, topart, tovolid; afs_int32 code, err, flags; @@ -2569,9 +2561,8 @@ ShadowVolume(as) } -static -CloneVolume(as) - register struct cmd_syndesc *as; +static int +CloneVolume(register struct cmd_syndesc *as, void *arock) { afs_int32 server, part, volid, cloneid, voltype; char partName[10], *volname; @@ -2677,9 +2668,8 @@ CloneVolume(as) } -static -BackupVolume(as) - register struct cmd_syndesc *as; +static int +BackupVolume(register struct cmd_syndesc *as, void *arock) { afs_int32 avolid, aserver, apart, vtype, code, err; struct nvldbentry entry; @@ -2746,9 +2736,8 @@ BackupVolume(as) return 0; } -static -ReleaseVolume(as) - register struct cmd_syndesc *as; +static int +ReleaseVolume(register struct cmd_syndesc *as, void *arock) { struct nvldbentry entry; @@ -2793,9 +2782,7 @@ ReleaseVolume(as) } static -DumpVolume(as) - register struct cmd_syndesc *as; - +DumpVolume(register struct cmd_syndesc *as, void *arock) { afs_int32 avolid, aserver, apart, voltype, fromdate = 0, code, err, i, flags; char filename[MAXPATHLEN]; @@ -2894,10 +2881,8 @@ retry_dump: #define TS_KEEP 2 #define TS_NEW 3 -static -RestoreVolume(as) - register struct cmd_syndesc *as; - +static int +RestoreVolume(register struct cmd_syndesc *as, void *arock) { afs_int32 avolid, aparentid, aserver, apart, code, vcode, err; afs_int32 aoverwrite = ASK; @@ -3186,10 +3171,8 @@ RestoreVolume(as) return 0; } -static -LockReleaseCmd(as) - register struct cmd_syndesc *as; - +static int +LockReleaseCmd(register struct cmd_syndesc *as, void *arock) { afs_int32 avolid, code, err; @@ -3213,9 +3196,8 @@ LockReleaseCmd(as) return 0; } -static -AddSite(as) - register struct cmd_syndesc *as; +static int +AddSite(register struct cmd_syndesc *as, void *arock) { afs_int32 avolid, aserver, apart, code, err; char apartName[10], avolname[VOLSER_MAXVOLNAME + 1]; @@ -3262,9 +3244,8 @@ AddSite(as) return 0; } -static -RemoveSite(as) - register struct cmd_syndesc *as; +static int +RemoveSite(register struct cmd_syndesc *as, void *arock) { afs_int32 avolid, aserver, apart, code, err; @@ -3314,9 +3295,8 @@ RemoveSite(as) return 0; } -static -ChangeLocation(as) - register struct cmd_syndesc *as; +static int +ChangeLocation(register struct cmd_syndesc *as, void *arock) { afs_int32 avolid, aserver, apart, code, err; char apartName[10]; @@ -3362,9 +3342,8 @@ ChangeLocation(as) return 0; } -static -ListPartitions(as) - register struct cmd_syndesc *as; +static int +ListPartitions(register struct cmd_syndesc *as, void *arock) { afs_int32 aserver, code; struct partList dummyPartList; @@ -3528,8 +3507,7 @@ XCompareVolID(a_obj1P, a_obj2P) *------------------------------------------------------------------------*/ static -ListVolumes(as) - register struct cmd_syndesc *as; +ListVolumes(register struct cmd_syndesc *as, void *arock) { afs_int32 apart, int32list, fast; afs_int32 aserver, code; @@ -3684,9 +3662,8 @@ ListVolumes(as) return 0; } -static -SyncVldb(as) - register struct cmd_syndesc *as; +static int +SyncVldb(register struct cmd_syndesc *as, void *arock) { afs_int32 pnum = 0, code; /* part name */ char part[10]; @@ -3763,10 +3740,8 @@ SyncVldb(as) return 0; } -static -SyncServer(as) - register struct cmd_syndesc *as; - +static int +SyncServer(register struct cmd_syndesc *as, void *arock) { afs_int32 pnum, code; /* part name */ char part[10]; @@ -3844,10 +3819,8 @@ VolumeInfoCmd(name) return 0; } -static -VolumeZap(as) - register struct cmd_syndesc *as; - +static int +VolumeZap(register struct cmd_syndesc *as, void *arock) { struct nvldbentry entry; afs_int32 volid, code, server, part, zapbackupid = 0, backupid = 0, err; @@ -3931,10 +3904,8 @@ VolumeZap(as) return 0; } -static -VolserStatus(as) - register struct cmd_syndesc *as; - +static int +VolserStatus(register struct cmd_syndesc *as, void *arock) { afs_int32 server, code; transDebugInfo *pntr, *oldpntr; @@ -4024,9 +3995,8 @@ VolserStatus(as) return 0; } -static -RenameVolume(as) - register struct cmd_syndesc *as; +static int +RenameVolume(register struct cmd_syndesc *as, void *arock) { afs_int32 code1, code2, code; struct nvldbentry entry; @@ -4145,10 +4115,8 @@ GetVolumeInfo(volid, server, part, voltype, rentry) return -1; } -static -DeleteEntry(as) - register struct cmd_syndesc *as; - +static int +DeleteEntry(register struct cmd_syndesc *as, void *arock) { afs_int32 apart; afs_int32 avolid; @@ -4370,9 +4338,8 @@ char *p1,*p2; } */ -static -ListVLDB(as) - struct cmd_syndesc *as; +static int +ListVLDB(struct cmd_syndesc *as, void *arock) { afs_int32 apart; afs_int32 aserver, code; @@ -4541,9 +4508,8 @@ ListVLDB(as) return 0; } -static -BackSys(as) - register struct cmd_syndesc *as; +static int +BackSys(register struct cmd_syndesc *as, void *arock) { afs_int32 apart = 0, avolid; afs_int32 aserver = 0, code, aserver1, apart1; @@ -4871,9 +4837,8 @@ BackSys(as) return 0; } -static -UnlockVLDB(as) - register struct cmd_syndesc *as; +static int +UnlockVLDB(register struct cmd_syndesc *as, void *arock) { afs_int32 apart; afs_int32 aserver, code; @@ -5001,9 +4966,8 @@ PrintInt64Size(afs_uint64 in) return output; } -static -PartitionInfo(as) - register struct cmd_syndesc *as; +static int +PartitionInfo(register struct cmd_syndesc *as, void *arock) { afs_int32 apart; afs_int32 aserver, code; @@ -5086,10 +5050,8 @@ PartitionInfo(as) return 0; } -static -ChangeAddr(as) - register struct cmd_syndesc *as; - +static int +ChangeAddr(register struct cmd_syndesc *as, void *arock) { afs_int32 ip1, ip2, vcode; int remove = 0; @@ -5236,9 +5198,8 @@ print_addrs(const bulkaddrs * addrs, const afsUUID * m_uuid, int nentries, return; } -static -ListAddrs(as) - register struct cmd_syndesc *as; +static int +ListAddrs(register struct cmd_syndesc *as, void *arock) { afs_int32 vcode; afs_int32 i, noresolve = 0, printuuid = 0; @@ -5344,10 +5305,8 @@ ListAddrs(as) return 0; } -static -LockEntry(as) - register struct cmd_syndesc *as; - +static int +LockEntry(register struct cmd_syndesc *as, void *arock) { afs_int32 avolid, vcode, err; @@ -5372,10 +5331,8 @@ LockEntry(as) return 0; } -static -ConvertRO(as) - register struct cmd_syndesc *as; - +static int +ConvertRO(register struct cmd_syndesc *as, void *arock) { afs_int32 partition = -1; afs_int32 server, volid, code, i, same; @@ -5538,9 +5495,8 @@ ConvertRO(as) return code; } -static -Sizes(as) - register struct cmd_syndesc *as; +static int +Sizes(register struct cmd_syndesc *as, void *arock) { afs_int32 avolid, aserver, apart, voltype, fromdate = 0, code, err, i; struct nvldbentry entry; @@ -5639,10 +5595,8 @@ PrintDiagnostics(astring, acode) } -static -MyBeforeProc(as, arock) - struct cmd_syndesc *as; - char *arock; +static int +MyBeforeProc(struct cmd_syndesc *as, void *arock) { register char *tcell; register afs_int32 code; @@ -5712,7 +5666,7 @@ main(argc, argv) cmd_SetBeforeProc(MyBeforeProc, NULL); - ts = cmd_CreateSyntax("create", CreateVolume, 0, "create a new volume"); + ts = cmd_CreateSyntax("create", CreateVolume, NULL, "create a new volume"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name"); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "volume name"); @@ -5723,14 +5677,14 @@ main(argc, argv) #endif COMMONPARMS; - ts = cmd_CreateSyntax("remove", DeleteVolume, 0, "delete a volume"); + ts = cmd_CreateSyntax("remove", DeleteVolume, NULL, "delete a volume"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "machine name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); COMMONPARMS; - ts = cmd_CreateSyntax("move", MoveVolume, 0, "move a volume"); + ts = cmd_CreateSyntax("move", MoveVolume, NULL, "move a volume"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); cmd_AddParm(ts, "-fromserver", CMD_SINGLE, 0, "machine name on source"); cmd_AddParm(ts, "-frompartition", CMD_SINGLE, 0, @@ -5743,7 +5697,7 @@ main(argc, argv) "copy live volume without cloning"); COMMONPARMS; - ts = cmd_CreateSyntax("copy", CopyVolume, 0, "copy a volume"); + ts = cmd_CreateSyntax("copy", CopyVolume, NULL, "copy a volume"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID on source"); cmd_AddParm(ts, "-fromserver", CMD_SINGLE, 0, "machine name on source"); cmd_AddParm(ts, "-frompartition", CMD_SINGLE, 0, @@ -5761,7 +5715,7 @@ main(argc, argv) "copy live volume without cloning"); COMMONPARMS; - ts = cmd_CreateSyntax("shadow", ShadowVolume, 0, + ts = cmd_CreateSyntax("shadow", ShadowVolume, NULL, "make or update a shadow volume"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID on source"); cmd_AddParm(ts, "-fromserver", CMD_SINGLE, 0, "machine name on source"); @@ -5785,12 +5739,12 @@ main(argc, argv) "do incremental update if target exists"); COMMONPARMS; - ts = cmd_CreateSyntax("backup", BackupVolume, 0, + ts = cmd_CreateSyntax("backup", BackupVolume, NULL, "make backup of a volume"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); COMMONPARMS; - ts = cmd_CreateSyntax("clone", CloneVolume, 0, + ts = cmd_CreateSyntax("clone", CloneVolume, NULL, "make clone of a volume"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "server"); @@ -5805,13 +5759,13 @@ main(argc, argv) "make clone volume read-only, not readwrite"); COMMONPARMS; - ts = cmd_CreateSyntax("release", ReleaseVolume, 0, "release a volume"); + ts = cmd_CreateSyntax("release", ReleaseVolume, NULL, "release a volume"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); cmd_AddParm(ts, "-force", CMD_FLAG, CMD_OPTIONAL, "force a complete release"); COMMONPARMS; - ts = cmd_CreateSyntax("dump", DumpVolume, 0, "dump a volume"); + ts = cmd_CreateSyntax("dump", DumpVolume, NULL, "dump a volume"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); cmd_AddParm(ts, "-time", CMD_SINGLE, CMD_OPTIONAL, "dump from time"); cmd_AddParm(ts, "-file", CMD_SINGLE, CMD_OPTIONAL, "dump file"); @@ -5823,7 +5777,7 @@ main(argc, argv) "omit unchanged directories from an incremental dump"); COMMONPARMS; - ts = cmd_CreateSyntax("restore", RestoreVolume, 0, "restore a volume"); + ts = cmd_CreateSyntax("restore", RestoreVolume, NULL, "restore a volume"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name"); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "name of volume to be restored"); @@ -5841,12 +5795,12 @@ main(argc, argv) "dump | keep | new"); COMMONPARMS; - ts = cmd_CreateSyntax("unlock", LockReleaseCmd, 0, + ts = cmd_CreateSyntax("unlock", LockReleaseCmd, NULL, "release lock on VLDB entry for a volume"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); COMMONPARMS; - ts = cmd_CreateSyntax("changeloc", ChangeLocation, 0, + ts = cmd_CreateSyntax("changeloc", ChangeLocation, NULL, "change an RW volume's location in the VLDB"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name for new location"); @@ -5855,25 +5809,25 @@ main(argc, argv) cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); COMMONPARMS; - ts = cmd_CreateSyntax("addsite", AddSite, 0, "add a replication site"); + ts = cmd_CreateSyntax("addsite", AddSite, NULL, "add a replication site"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name for new site"); cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name for new site"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); COMMONPARMS; - ts = cmd_CreateSyntax("remsite", RemoveSite, 0, + ts = cmd_CreateSyntax("remsite", RemoveSite, NULL, "remove a replication site"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); COMMONPARMS; - ts = cmd_CreateSyntax("listpart", ListPartitions, 0, "list partitions"); + ts = cmd_CreateSyntax("listpart", ListPartitions, NULL, "list partitions"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); COMMONPARMS; - ts = cmd_CreateSyntax("listvol", ListVolumes, 0, + ts = cmd_CreateSyntax("listvol", ListVolumes, NULL, "list volumes on server (bypass VLDB)"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name"); @@ -5890,20 +5844,20 @@ main(argc, argv) #endif /* FULL_LISTVOL_SWITCH */ COMMONPARMS; - ts = cmd_CreateSyntax("syncvldb", SyncVldb, 0, + ts = cmd_CreateSyntax("syncvldb", SyncVldb, NULL, "synchronize VLDB with server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "machine name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name"); cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_OPTIONAL, "volume name or ID"); COMMONPARMS; - ts = cmd_CreateSyntax("syncserv", SyncServer, 0, + ts = cmd_CreateSyntax("syncserv", SyncServer, NULL, "synchronize server with VLDB"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name"); COMMONPARMS; - ts = cmd_CreateSyntax("examine", ExamineVolume, 0, + ts = cmd_CreateSyntax("examine", ExamineVolume, NULL, "everything about the volume"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); cmd_AddParm(ts, "-extended", CMD_FLAG, CMD_OPTIONAL, @@ -5915,14 +5869,14 @@ main(argc, argv) COMMONPARMS; cmd_CreateAlias(ts, "volinfo"); - ts = cmd_CreateSyntax("setfields", SetFields, 0, + ts = cmd_CreateSyntax("setfields", SetFields, NULL, "change volume info fields"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); cmd_AddParm(ts, "-maxquota", CMD_SINGLE, CMD_OPTIONAL, "quota (KB)"); cmd_AddParm(ts, "-clearuse", CMD_FLAG, CMD_OPTIONAL, "clear dayUse"); COMMONPARMS; - ts = cmd_CreateSyntax("offline", volOffline, 0, (char *)CMD_HIDDEN); + ts = cmd_CreateSyntax("offline", volOffline, NULL, (char *)CMD_HIDDEN); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "server name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); @@ -5930,13 +5884,13 @@ main(argc, argv) cmd_AddParm(ts, "-busy", CMD_FLAG, CMD_OPTIONAL, "busy volume"); COMMONPARMS; - ts = cmd_CreateSyntax("online", volOnline, 0, (char *)CMD_HIDDEN); + ts = cmd_CreateSyntax("online", volOnline, NULL, (char *)CMD_HIDDEN); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "server name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); COMMONPARMS; - ts = cmd_CreateSyntax("zap", VolumeZap, 0, + ts = cmd_CreateSyntax("zap", VolumeZap, NULL, "delete the volume, don't bother with VLDB"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name"); @@ -5947,17 +5901,17 @@ main(argc, argv) "also delete backup volume if one is found"); COMMONPARMS; - ts = cmd_CreateSyntax("status", VolserStatus, 0, + ts = cmd_CreateSyntax("status", VolserStatus, NULL, "report on volser status"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); COMMONPARMS; - ts = cmd_CreateSyntax("rename", RenameVolume, 0, "rename a volume"); + ts = cmd_CreateSyntax("rename", RenameVolume, NULL, "rename a volume"); cmd_AddParm(ts, "-oldname", CMD_SINGLE, 0, "old volume name "); cmd_AddParm(ts, "-newname", CMD_SINGLE, 0, "new volume name "); COMMONPARMS; - ts = cmd_CreateSyntax("listvldb", ListVLDB, 0, + ts = cmd_CreateSyntax("listvldb", ListVLDB, NULL, "list volumes in the VLDB"); cmd_AddParm(ts, "-name", CMD_SINGLE, CMD_OPTIONAL, "volume name or ID"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "machine name"); @@ -5969,7 +5923,7 @@ main(argc, argv) "do not alphabetically sort the volume names"); COMMONPARMS; - ts = cmd_CreateSyntax("backupsys", BackSys, 0, "en masse backups"); + ts = cmd_CreateSyntax("backupsys", BackSys, NULL, "en masse backups"); cmd_AddParm(ts, "-prefix", CMD_LIST, CMD_OPTIONAL, "common prefix on volume(s)"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "machine name"); @@ -5981,7 +5935,7 @@ main(argc, argv) cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL, "no action"); COMMONPARMS; - ts = cmd_CreateSyntax("delentry", DeleteEntry, 0, + ts = cmd_CreateSyntax("delentry", DeleteEntry, NULL, "delete VLDB entry for a volume"); cmd_AddParm(ts, "-id", CMD_LIST, CMD_OPTIONAL, "volume name or ID"); cmd_AddParm(ts, "-prefix", CMD_SINGLE, CMD_OPTIONAL, @@ -5992,7 +5946,7 @@ main(argc, argv) "no execute"); COMMONPARMS; - ts = cmd_CreateSyntax("partinfo", PartitionInfo, 0, + ts = cmd_CreateSyntax("partinfo", PartitionInfo, NULL, "list partition information"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name"); @@ -6000,18 +5954,18 @@ main(argc, argv) "print storage summary"); COMMONPARMS; - ts = cmd_CreateSyntax("unlockvldb", UnlockVLDB, 0, + ts = cmd_CreateSyntax("unlockvldb", UnlockVLDB, NULL, "unlock all the locked entries in the VLDB"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "machine name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name"); COMMONPARMS; - ts = cmd_CreateSyntax("lock", LockEntry, 0, + ts = cmd_CreateSyntax("lock", LockEntry, NULL, "lock VLDB entry for a volume"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); COMMONPARMS; - ts = cmd_CreateSyntax("changeaddr", ChangeAddr, 0, + ts = cmd_CreateSyntax("changeaddr", ChangeAddr, NULL, "change the IP address of a file server"); cmd_AddParm(ts, "-oldaddr", CMD_SINGLE, 0, "original IP address"); cmd_AddParm(ts, "-newaddr", CMD_SINGLE, CMD_OPTIONAL, "new IP address"); @@ -6019,7 +5973,7 @@ main(argc, argv) "remove the IP address from the VLDB"); COMMONPARMS; - ts = cmd_CreateSyntax("listaddrs", ListAddrs, 0, + ts = cmd_CreateSyntax("listaddrs", ListAddrs, NULL, "list the IP address of all file servers registered in the VLDB"); cmd_AddParm(ts, "-uuid", CMD_SINGLE, CMD_OPTIONAL, "uuid of server"); cmd_AddParm(ts, "-host", CMD_SINGLE, CMD_OPTIONAL, "address of host"); @@ -6029,7 +5983,7 @@ main(argc, argv) "print uuid of hosts"); COMMONPARMS; - ts = cmd_CreateSyntax("convertROtoRW", ConvertRO, 0, + ts = cmd_CreateSyntax("convertROtoRW", ConvertRO, NULL, "convert a RO volume into a RW volume (after loss of old RW volume)"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name"); @@ -6037,7 +5991,7 @@ main(argc, argv) cmd_AddParm(ts, "-force", CMD_FLAG, CMD_OPTIONAL, "don't ask"); COMMONPARMS; - ts = cmd_CreateSyntax("size", Sizes, 0, + ts = cmd_CreateSyntax("size", Sizes, NULL, "obtain various sizes of the volume."); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name"); diff --git a/src/xstat/xstat_cm_test.c b/src/xstat/xstat_cm_test.c index 6c51cce9b..fae9390aa 100644 --- a/src/xstat/xstat_cm_test.c +++ b/src/xstat/xstat_cm_test.c @@ -1225,9 +1225,7 @@ CountListItems(a_firstItem) *------------------------------------------------------------------------*/ int -RunTheTest(a_s) - struct cmd_syndesc *a_s; - +RunTheTest(struct cmd_syndesc *a_s, void *arock) { /*RunTheTest */ static char rn[] = "RunTheTest"; /*Routine name */ @@ -1435,7 +1433,7 @@ main(argc, argv) /* * Set up the commands we understand. */ - ts = cmd_CreateSyntax("initcmd", RunTheTest, 0, "initialize the program"); + ts = cmd_CreateSyntax("initcmd", RunTheTest, NULL, "initialize the program"); cmd_AddParm(ts, "-cmname", CMD_LIST, CMD_REQUIRED, "Cache Manager name(s) to monitor"); cmd_AddParm(ts, "-collID", CMD_LIST, CMD_REQUIRED, -- 2.39.5