From 8ed99018cc72cfad88fd4ddf31870ccda56a5aba Mon Sep 17 00:00:00 2001 From: Nickolai Zeldovich Date: Sun, 21 Apr 2002 05:01:48 +0000 Subject: [PATCH] Fix some of the fallout from having rxgen-fabricated prototypes. (cherry picked from commit ebb45c54d9a53906c2dc1245199cb95a0260252b) --- src/kauth/kaprocs.c | 36 ++++++++++++------------- src/kauth/kauth.rg | 5 +++- src/ptserver/ptint.xg | 1 + src/ptserver/ptprocs.c | 50 +++++++++++++++++------------------ src/ubik/ubik_int.xg | 56 +++++++++++++++++++-------------------- src/ubik/utst_server.c | 20 +++++++------- src/vlserver/vldbint.xg | 1 + src/vlserver/vlprocs.c | 58 ++++++++++++++++++++--------------------- 8 files changed, 116 insertions(+), 111 deletions(-) diff --git a/src/kauth/kaprocs.c b/src/kauth/kaprocs.c index 0279fc50a..2b557fdcf 100644 --- a/src/kauth/kaprocs.c +++ b/src/kauth/kaprocs.c @@ -542,7 +542,7 @@ static int create_user (tt, name, instance, key, caller, flags) /* Put actual stub routines here */ -afs_int32 KAM_CreateUser (call, aname, ainstance, ainitpw) +afs_int32 SKAM_CreateUser (call, aname, ainstance, ainitpw) struct rx_call *call; char *aname; char *ainstance; @@ -587,7 +587,7 @@ afs_int32 kamCreateUser (call, aname, ainstance, ainitpw) return code; } -afs_int32 KAA_ChangePassword (call, aname, ainstance, arequest, oanswer) +afs_int32 SKAA_ChangePassword (call, aname, ainstance, arequest, oanswer) struct rx_call *call; char *aname; char *ainstance; @@ -802,7 +802,7 @@ set_password (tt, name, instance, password, kvno, caller) return(0); } -afs_int32 KAM_SetPassword (call, aname, ainstance, akvno, apassword) +afs_int32 SKAM_SetPassword (call, aname, ainstance, akvno, apassword) struct rx_call *call; char *aname; char *ainstance; @@ -1180,7 +1180,7 @@ abort: return code; } -afs_int32 KAA_Authenticate_old (call, aname, ainstance, start, end, +afs_int32 SKAA_Authenticate_old (call, aname, ainstance, start, end, arequest, oanswer) struct rx_call *call; char *aname; @@ -1199,7 +1199,7 @@ afs_int32 KAA_Authenticate_old (call, aname, ainstance, start, end, return code; } -afs_int32 KAA_Authenticate (call, aname, ainstance, start, end, arequest, oanswer) +afs_int32 SKAA_Authenticate (call, aname, ainstance, start, end, arequest, oanswer) struct rx_call *call; char *aname; char *ainstance; @@ -1216,7 +1216,7 @@ afs_int32 KAA_Authenticate (call, aname, ainstance, start, end, arequest, oanswe return code; } -afs_int32 KAA_AuthenticateV2 (call, aname, ainstance, start, end, arequest, oanswer) +afs_int32 SKAA_AuthenticateV2 (call, aname, ainstance, start, end, arequest, oanswer) struct rx_call *call; char *aname; char *ainstance; @@ -1233,7 +1233,7 @@ afs_int32 KAA_AuthenticateV2 (call, aname, ainstance, start, end, arequest, oans return code; } -afs_int32 KAM_SetFields (call, aname, ainstance, aflags, +afs_int32 SKAM_SetFields (call, aname, ainstance, aflags, aexpiration, alifetime, amaxAssociates, misc_auth_bytes, spare2) struct rx_call *call; char *aname; @@ -1387,7 +1387,7 @@ abort: /* delete a user */ -afs_int32 KAM_DeleteUser(call, aname, ainstance) +afs_int32 SKAM_DeleteUser(call, aname, ainstance) struct rx_call *call; char *aname; char *ainstance; @@ -1457,7 +1457,7 @@ afs_int32 kamDeleteUser(call, aname, ainstance) * report that the ID is not locked, or else to find out when the ID * will be unlocked. */ -afs_int32 KAM_GetEntry (call, aname, ainstance, aversion, aentry) +afs_int32 SKAM_GetEntry (call, aname, ainstance, aversion, aentry) struct rx_call *call; char *aname; char *ainstance; @@ -1579,7 +1579,7 @@ abort: return code; } -afs_int32 KAM_ListEntry (call, previous_index, index, count, name) +afs_int32 SKAM_ListEntry (call, previous_index, index, count, name) struct rx_call *call; afs_int32 previous_index; /* last entry ret'd or 0 for first */ afs_int32 *index; /* index of this entry */ @@ -1812,7 +1812,7 @@ abort: return code; } -afs_int32 KAT_GetTicket_old (call, kvno, authDomain, aticket, +afs_int32 SKAT_GetTicket_old (call, kvno, authDomain, aticket, sname, sinstance, atimes, oanswer) struct rx_call *call; afs_int32 kvno; @@ -1833,7 +1833,7 @@ int code; return code; } -afs_int32 KAT_GetTicket (call, kvno, authDomain, aticket, +afs_int32 SKAT_GetTicket (call, kvno, authDomain, aticket, sname, sinstance, atimes, oanswer) struct rx_call *call; afs_int32 kvno; @@ -1852,7 +1852,7 @@ int code; return code; } -afs_int32 KAM_GetStats (call, version, admin_accounts, statics, dynamics) +afs_int32 SKAM_GetStats (call, version, admin_accounts, statics, dynamics) struct rx_call *call; afs_int32 version; afs_int32 *admin_accounts; @@ -1935,7 +1935,7 @@ afs_int32 kamGetStats (call, version, admin_accounts, statics, dynamics) return code; } -afs_int32 KAM_GetPassword (call, name, password) +afs_int32 SKAM_GetPassword (call, name, password) struct rx_call *call; char *name; EncryptionKey *password; @@ -1993,7 +1993,7 @@ afs_int32 kamGetPassword (call, name, password) return code; } -afs_int32 KAM_GetRandomKey (call, key) +afs_int32 SKAM_GetRandomKey (call, key) struct rx_call *call; EncryptionKey *key; { @@ -2016,7 +2016,7 @@ afs_int32 kamGetRandomKey (call, key) return 0; } -afs_int32 KAM_Debug (call, version, checkDB, info) +afs_int32 SKAM_Debug (call, version, checkDB, info) struct rx_call *call; afs_int32 version; int checkDB; /* start a transaction to examine DB */ @@ -2091,7 +2091,7 @@ afs_int32 kamDebug (call, version, checkDB, info) * prob'ly ought to check the noauth flag. */ #define ABORTIF(A) {if(code= A){goto abort;}} -afs_int32 KAM_Unlock (call, aname, ainstance, spare1, spare2, spare3, spare4) +afs_int32 SKAM_Unlock (call, aname, ainstance, spare1, spare2, spare3, spare4) struct rx_call *call; char *aname; char *ainstance; @@ -2130,7 +2130,7 @@ exit: return code; } -afs_int32 KAM_LockStatus (call, aname, ainstance, lockeduntil, spare1, spare2, spare3, spare4) +afs_int32 SKAM_LockStatus (call, aname, ainstance, lockeduntil, spare1, spare2, spare3, spare4) struct rx_call *call; char *aname; char *ainstance; diff --git a/src/kauth/kauth.rg b/src/kauth/kauth.rg index 6373c6374..640af4cc7 100644 --- a/src/kauth/kauth.rg +++ b/src/kauth/kauth.rg @@ -221,6 +221,7 @@ struct ka_debugInfo { /* finally the procedural definitions */ package KAA_ +prefix S statindex 18 proc Authenticate_old( @@ -258,6 +259,7 @@ proc ChangePassword( ) = 2; package KAT_ +prefix S statindex 19 proc GetTicket_old( @@ -281,6 +283,7 @@ proc GetTicket( ) = 23; package KAM_ +prefix S statindex 20 proc SetPassword( @@ -297,7 +300,7 @@ proc SetFields( IN Date user_expiration, IN afs_int32 max_ticket_lifetime, IN afs_int32 maxAssociates, - IN afs_int32 spare1, + IN afs_uint32 misc_auth_bytes, IN afs_int32 spare2 ) = 5; diff --git a/src/ptserver/ptint.xg b/src/ptserver/ptint.xg index 88702f95b..4f453ee8c 100644 --- a/src/ptserver/ptint.xg +++ b/src/ptserver/ptint.xg @@ -8,6 +8,7 @@ */ package PR_ +prefix S statindex 8 #include "ptopcodes.h" diff --git a/src/ptserver/ptprocs.c b/src/ptserver/ptprocs.c index faa0864dd..9336a06f9 100644 --- a/src/ptserver/ptprocs.c +++ b/src/ptserver/ptprocs.c @@ -161,7 +161,7 @@ afs_int32 WhoIsThis (acall, at, aid) return 0; } -afs_int32 PR_INewEntry (call,aname,aid,oid) +afs_int32 SPR_INewEntry (call,aname,aid,oid) struct rx_call *call; char aname[PR_MAXNAMELEN]; afs_int32 aid; @@ -225,7 +225,7 @@ afs_int32 iNewEntry (call,aname,aid,oid) } -afs_int32 PR_NewEntry (call, aname, flag, oid, aid) +afs_int32 SPR_NewEntry (call, aname, flag, oid, aid) struct rx_call *call; char aname[PR_MAXNAMELEN]; afs_int32 flag; @@ -263,7 +263,7 @@ afs_int32 newEntry (call, aname, flag, oid, aid) if (code) ABORT_WITH(tt,code); /* this is for cross-cell self registration. It is not added in the - * PR_INewEntry because we want self-registration to only do + * SPR_INewEntry because we want self-registration to only do * automatic id assignment. */ code = WhoIsThisWithName(call,tt,&cid,cname); @@ -286,7 +286,7 @@ afs_int32 newEntry (call, aname, flag, oid, aid) -afs_int32 PR_WhereIsIt (call,aid,apos) +afs_int32 SPR_WhereIsIt (call,aid,apos) struct rx_call *call; afs_int32 aid; afs_int32 *apos; @@ -325,7 +325,7 @@ afs_int32 *apos; } -afs_int32 PR_DumpEntry (call,apos, aentry) +afs_int32 SPR_DumpEntry (call,apos, aentry) struct rx_call *call; afs_int32 apos; struct prdebugentry *aentry; @@ -376,7 +376,7 @@ struct prdebugentry *aentry; return PRSUCCESS; } -afs_int32 PR_AddToGroup (call,aid,gid) +afs_int32 SPR_AddToGroup (call,aid,gid) struct rx_call *call; afs_int32 aid; afs_int32 gid; @@ -439,7 +439,7 @@ afs_int32 gid; return PRSUCCESS; } -afs_int32 PR_NameToID (call, aname, aid) +afs_int32 SPR_NameToID (call, aname, aid) struct rx_call *call; namelist *aname; idlist *aid; @@ -495,11 +495,11 @@ afs_int32 nameToID (call, aname, aid) } /* - * PR_IDToName + * SPR_IDToName * Given an array of ids, find the name for each of them. * The array of ids and names is unlimited. */ -afs_int32 PR_IDToName (call, aid, aname) +afs_int32 SPR_IDToName (call, aid, aname) struct rx_call *call; idlist *aid; namelist *aname; @@ -553,7 +553,7 @@ afs_int32 idToName (call, aid, aname) return PRSUCCESS; } -afs_int32 PR_Delete (call, aid) +afs_int32 SPR_Delete (call, aid) struct rx_call *call; afs_int32 aid; { @@ -692,7 +692,7 @@ afs_int32 Delete (call, aid) return PRSUCCESS; } -afs_int32 PR_UpdateEntry (call, aid, name, uentry) +afs_int32 SPR_UpdateEntry (call, aid, name, uentry) struct rx_call *call; afs_int32 aid; char *name; @@ -757,7 +757,7 @@ afs_int32 PR_UpdateEntry (call, aid, name, uentry) return PRSUCCESS; } -afs_int32 PR_RemoveFromGroup (call,aid,gid) +afs_int32 SPR_RemoveFromGroup (call,aid,gid) struct rx_call *call; afs_int32 aid; afs_int32 gid; @@ -817,7 +817,7 @@ afs_int32 gid; } -afs_int32 PR_GetCPS (call, aid, alist, over) +afs_int32 SPR_GetCPS (call, aid, alist, over) struct rx_call *call; afs_int32 aid; prlist *alist; @@ -888,7 +888,7 @@ int inCPS (CPS,id) #endif /* IP_WILDCARDS */ -afs_int32 PR_GetCPS2 (call, aid, ahost, alist, over) +afs_int32 SPR_GetCPS2 (call, aid, ahost, alist, over) struct rx_call *call; afs_int32 aid; afs_int32 ahost; @@ -973,7 +973,7 @@ afs_int32 getCPS2 (call, aid, ahost, alist, over) } -afs_int32 PR_GetHostCPS (call, ahost, alist, over) +afs_int32 SPR_GetHostCPS (call, ahost, alist, over) struct rx_call *call; afs_int32 ahost; prlist *alist; @@ -1038,7 +1038,7 @@ bad: } -afs_int32 PR_ListMax (call,uid,gid) +afs_int32 SPR_ListMax (call,uid,gid) struct rx_call *call; afs_int32 *uid; afs_int32 *gid; @@ -1075,7 +1075,7 @@ afs_int32 *gid; return PRSUCCESS; } -afs_int32 PR_SetMax (call,aid,gflag) +afs_int32 SPR_SetMax (call,aid,gflag) struct rx_call *call; afs_int32 aid; afs_int32 gflag; @@ -1118,7 +1118,7 @@ afs_int32 gflag; return PRSUCCESS; } -afs_int32 PR_ListEntry (call,aid,aentry) +afs_int32 SPR_ListEntry (call,aid,aentry) struct rx_call *call; afs_int32 aid; struct prcheckentry *aentry; @@ -1178,7 +1178,7 @@ struct prcheckentry *aentry; return PRSUCCESS; } -afs_int32 PR_ListEntries(call, flag, startindex, bulkentries, nextstartindex) +afs_int32 SPR_ListEntries(call, flag, startindex, bulkentries, nextstartindex) struct rx_call *call; afs_int32 flag; afs_int32 startindex; @@ -1305,7 +1305,7 @@ afs_int32 put_prentries(tentry, bulkentries) return 0; } -afs_int32 PR_ChangeEntry (call,aid,name,oid,newid) +afs_int32 SPR_ChangeEntry (call,aid,name,oid,newid) struct rx_call *call; afs_int32 aid; char *name; @@ -1360,7 +1360,7 @@ afs_int32 newid; return code; } -afs_int32 PR_SetFieldsEntry (call, id, mask, flags, ngroups, nusers, spare1, spare2) +afs_int32 SPR_SetFieldsEntry (call, id, mask, flags, ngroups, nusers, spare1, spare2) struct rx_call *call; afs_int32 id; afs_int32 mask; /* specify which fields to update */ @@ -1445,7 +1445,7 @@ afs_int32 setFieldsEntry (call, id, mask, flags, ngroups, nusers, spare1, spare2 return code; } -afs_int32 PR_ListElements (call, aid, alist, over) +afs_int32 SPR_ListElements (call, aid, alist, over) struct rx_call *call; afs_int32 aid; prlist *alist; @@ -1501,13 +1501,13 @@ afs_int32 listElements (call, aid, alist, over) } /* - * PR_istOwned + * SPR_ListOwned * List the entries owned by this id. If the id is zero, * return the orphans list. This will return up to PR_MAXGROUPS * at a time with the lastP available to get the rest. The * maximum value is enforced in GetOwnedChain(). */ -afs_int32 PR_ListOwned (call, aid, alist, lastP) +afs_int32 SPR_ListOwned (call, aid, alist, lastP) struct rx_call *call; afs_int32 aid; prlist *alist; @@ -1584,7 +1584,7 @@ afs_int32 listOwned (call, aid, alist, lastP) return code; } -afs_int32 PR_IsAMemberOf (call,uid,gid,flag) +afs_int32 SPR_IsAMemberOf (call,uid,gid,flag) struct rx_call *call; afs_int32 uid; afs_int32 gid; diff --git a/src/ubik/ubik_int.xg b/src/ubik/ubik_int.xg index df8e7f731..1d8c392c0 100644 --- a/src/ubik/ubik_int.xg +++ b/src/ubik/ubik_int.xg @@ -15,12 +15,12 @@ struct BDesc { afs_int32 session; }; -struct net_version { +struct ubik_version { afs_int32 epoch; afs_int32 counter; }; -struct net_tid { +struct ubik_tid { afs_int32 epoch; afs_int32 counter; }; @@ -38,8 +38,8 @@ struct ubik_debug { afs_int32 lowestTime; /* time we last chose lowestHost */ afs_int32 syncHost; /* sync site we've heard from last (even if we didn't vote) */ afs_int32 syncTime; /* time of above */ - struct net_version syncVersion; /* sync site's claimed db version */ - struct net_tid syncTid; /* sync site's claimed tid */ + struct ubik_version syncVersion; /* sync site's claimed db version */ + struct ubik_tid syncTid; /* sync site's claimed tid */ /* variables from beacon module */ afs_int32 amSyncSite; /* do I think I'm the sync site */ @@ -49,7 +49,7 @@ struct ubik_debug { /* variables from disk module */ afs_int32 lockedPages; /* count of read-locked pages */ afs_int32 writeLockedPages; /* count of write-locked pages */ - struct net_version localVersion; + struct ubik_version localVersion; afs_int32 activeWrite; /* is there an active write transaction with this as sync site */ afs_int32 tidCounter; /* tid counter field from dbase, or 0 if no write trans. */ @@ -76,7 +76,7 @@ struct ubik_sdebug { afs_int32 lastVoteTime; /* time last vote received */ afs_int32 lastBeaconSent; /* time last beacon sent */ afs_int32 lastVote; /* was last vote yes? */ - struct net_version remoteVersion; + struct ubik_version remoteVersion; afs_int32 currentDB; /* is current DB up to date? */ afs_int32 beaconSinceDown; /* beacon sent since last noticed up? */ afs_int32 up; /* is site up */ @@ -95,8 +95,8 @@ struct ubik_debug_old { afs_int32 lowestTime; /* time we last chose lowestHost */ afs_int32 syncHost; /* sync site we've heard from last (even if we didn't vote) */ afs_int32 syncTime; /* time of above */ - struct net_version syncVersion; /* sync site's claimed db version */ - struct net_tid syncTid; /* sync site's claimed tid */ + struct ubik_version syncVersion; /* sync site's claimed db version */ + struct ubik_tid syncTid; /* sync site's claimed tid */ /* variables from beacon module */ afs_int32 amSyncSite; /* do I think I'm the sync site */ @@ -106,7 +106,7 @@ struct ubik_debug_old { /* variables from disk module */ afs_int32 lockedPages; /* count of read-locked pages */ afs_int32 writeLockedPages; /* count of write-locked pages */ - struct net_version localVersion; + struct ubik_version localVersion; afs_int32 activeWrite; /* is there an active write transaction with this as sync site */ afs_int32 tidCounter; /* tid counter field from dbase, or 0 if no write trans. */ @@ -131,7 +131,7 @@ struct ubik_sdebug_old { afs_int32 lastVoteTime; /* time last vote received */ afs_int32 lastBeaconSent; /* time last beacon sent */ afs_int32 lastVote; /* was last vote yes? */ - struct net_version remoteVersion; + struct ubik_version remoteVersion; afs_int32 currentDB; /* is current DB up to date? */ afs_int32 beaconSinceDown; /* beacon sent since last noticed up? */ afs_int32 up; /* is site up */ @@ -173,8 +173,8 @@ statindex 11 /* Vote package interface calls */ Beacon (IN afs_int32 state, afs_int32 voteStart, - net_version *Version, - net_tid *tid) multi = VOTE_BEACON; + ubik_version *Version, + ubik_tid *tid) multi = VOTE_BEACON; DebugOld (OUT ubik_debug_old *db) = VOTE_DEBUG_OLD; @@ -204,12 +204,12 @@ statindex 12 #define DISK_COMMIT 20001 #define DISK_LOCK 20002 #define DISK_WRITE 20003 -#define DISK_GETVERSION 20004 +#define DISK_GETVERSION 20004 #define DISK_GETFILE 20005 #define DISK_SENDFILE 20006 #define DISK_ABORT 20007 #define DISK_RELEASELOCKS 20008 -#define DISK_TRUNCATE 20009 +#define DISK_TRUNCATE 20009 #define DISK_PROBE 20010 #define DISK_WRITEV 20011 #define DISK_INTERFACEADDR 20012 @@ -218,47 +218,47 @@ statindex 12 /* Disk package interface calls - the order of * these declarations is important. */ -Begin (IN net_tid *tid) = DISK_BEGIN; +Begin (IN ubik_tid *tid) = DISK_BEGIN; -Commit (IN net_tid *tid) = DISK_COMMIT; +Commit (IN ubik_tid *tid) = DISK_COMMIT; -Lock (IN net_tid *tid, +Lock (IN ubik_tid *tid, afs_int32 file, afs_int32 position, afs_int32 length, afs_int32 type) = DISK_LOCK; -Write (IN net_tid *tid, +Write (IN ubik_tid *tid, afs_int32 file, afs_int32 position, bulkdata *data) = DISK_WRITE; -GetVersion (OUT net_version *Version) = DISK_GETVERSION; +GetVersion (OUT ubik_version *Version) = DISK_GETVERSION; GetFile (IN afs_int32 file, - OUT net_version *Version) split = DISK_GETFILE; + OUT ubik_version *Version) split = DISK_GETFILE; SendFile (IN afs_int32 file, afs_int32 length, - net_version *Version) split = DISK_SENDFILE ; + ubik_version *Version) split = DISK_SENDFILE ; -Abort (IN net_tid *tid) = DISK_ABORT; +Abort (IN ubik_tid *tid) = DISK_ABORT; -ReleaseLocks (IN net_tid *tid) = DISK_RELEASELOCKS; +ReleaseLocks (IN ubik_tid *tid) = DISK_RELEASELOCKS; -Truncate (IN net_tid *tid, +Truncate (IN ubik_tid *tid, afs_int32 file, afs_int32 length) = DISK_TRUNCATE; Probe () multi = DISK_PROBE; -WriteV (IN net_tid *tid, +WriteV (IN ubik_tid *tid, iovec_wrt *io_vector, iovec_buf *io_buffer) = DISK_WRITEV; UpdateInterfaceAddr(IN UbikInterfaceAddr* inAddr, OUT UbikInterfaceAddr* outAddr) multi = DISK_INTERFACEADDR; -SetVersion (IN net_tid *tid, - IN net_version *OldVersion, - IN net_version *NewVersion) = DISK_SETVERSION; +SetVersion (IN ubik_tid *tid, + IN ubik_version *OldVersion, + IN ubik_version *NewVersion) = DISK_SETVERSION; diff --git a/src/ubik/utst_server.c b/src/ubik/utst_server.c index 49d05123e..9bd04b003 100644 --- a/src/ubik/utst_server.c +++ b/src/ubik/utst_server.c @@ -42,8 +42,8 @@ RCSID("$Header$"); struct ubik_dbase *dbase; afs_int32 sleepTime; -SAMPLE_Inc(rxcall) -struct rx_call *rxcall; +SAMPLE_Inc(rxconn) +struct rx_connection *rxconn; { afs_int32 code, temp; struct ubik_trans *tt; @@ -99,8 +99,8 @@ this program's convention for locking the whole database */ } -SAMPLE_Get(rxcall, gnumber) -struct rx_call *rxcall; +SAMPLE_Get(rxconn, gnumber) +struct rx_connection *rxconn; afs_int32 *gnumber; { afs_int32 code, temp; @@ -143,8 +143,8 @@ afs_int32 *gnumber; } -SAMPLE_QGet(rxcall, gnumber) -struct rx_call *rxcall; +SAMPLE_QGet(rxconn, gnumber) +struct rx_connection *rxconn; afs_int32 *gnumber; { afs_int32 code, temp; @@ -187,8 +187,8 @@ afs_int32 *gnumber; } -SAMPLE_Trun(rxcall) -struct rx_call *rxcall; +SAMPLE_Trun(rxconn) +struct rx_connection *rxconn; { afs_int32 code; struct ubik_trans *tt; @@ -222,8 +222,8 @@ struct rx_call *rxcall; } -SAMPLE_Test(rxcall) -struct rx_call *rxcall; +SAMPLE_Test(rxconn) +struct rx_connection *rxconn; { afs_int32 code, temp; struct ubik_trans *tt; diff --git a/src/vlserver/vldbint.xg b/src/vlserver/vldbint.xg index faa568c38..6b54cfbe6 100644 --- a/src/vlserver/vldbint.xg +++ b/src/vlserver/vldbint.xg @@ -8,6 +8,7 @@ */ package VL_ +prefix S statindex 15 #include "vl_opcodes.h" diff --git a/src/vlserver/vlprocs.c b/src/vlserver/vlprocs.c index da599610c..bcd35bf89 100644 --- a/src/vlserver/vlprocs.c +++ b/src/vlserver/vlprocs.c @@ -148,7 +148,7 @@ int Init_VLdbase (trans, locktype, this_op) /* Create a new vldb entry; both new volume id and name must be unique (non-existant in vldb). */ -VL_CreateEntry(rxcall, newentry) +SVL_CreateEntry(rxcall, newentry) struct rx_call *rxcall; struct vldbentry *newentry; { struct ubik_trans *trans; @@ -221,7 +221,7 @@ VL_CreateEntry(rxcall, newentry) } -VL_CreateEntryN(rxcall, newentry) +SVL_CreateEntryN(rxcall, newentry) struct rx_call *rxcall; struct nvldbentry *newentry; { struct ubik_trans *trans; @@ -294,7 +294,7 @@ VL_CreateEntryN(rxcall, newentry) } -VL_ChangeAddr(rxcall, ip1, ip2) +SVL_ChangeAddr(rxcall, ip1, ip2) struct rx_call *rxcall; afs_int32 ip1, ip2; { struct ubik_trans *trans; @@ -328,7 +328,7 @@ VL_ChangeAddr(rxcall, ip1, ip2) } /* Delete a vldb entry given the volume id. */ -VL_DeleteEntry(rxcall, volid, voltype) +SVL_DeleteEntry(rxcall, volid, voltype) struct rx_call *rxcall; afs_int32 volid; afs_int32 voltype; @@ -410,7 +410,7 @@ GetEntryByID (rxcall, volid, voltype, aentry, new, this_op) return(ubik_EndTrans(trans)); } -VL_GetEntryByID (rxcall, volid, voltype, aentry) +SVL_GetEntryByID (rxcall, volid, voltype, aentry) struct rx_call *rxcall; afs_int32 volid, voltype; vldbentry *aentry; /* entry data copied here */ @@ -419,7 +419,7 @@ VL_GetEntryByID (rxcall, volid, voltype, aentry) return (GetEntryByID(rxcall, volid, voltype, (char *)aentry, 0, this_op)); } -VL_GetEntryByIDN (rxcall, volid, voltype, aentry) +SVL_GetEntryByIDN (rxcall, volid, voltype, aentry) struct rx_call *rxcall; afs_int32 volid, voltype; nvldbentry *aentry; /* entry data copied here */ @@ -428,7 +428,7 @@ VL_GetEntryByIDN (rxcall, volid, voltype, aentry) return (GetEntryByID(rxcall, volid, voltype, (char *)aentry, 1, this_op)); } -VL_GetEntryByIDU (rxcall, volid, voltype, aentry) +SVL_GetEntryByIDU (rxcall, volid, voltype, aentry) struct rx_call *rxcall; afs_int32 volid, voltype; uvldbentry *aentry; /* entry data copied here */ @@ -490,7 +490,7 @@ GetEntryByName (rxcall, volname, aentry, new, this_op) return(ubik_EndTrans(trans)); } -VL_GetEntryByNameO (rxcall, volname, aentry) +SVL_GetEntryByNameO (rxcall, volname, aentry) struct rx_call *rxcall; char *volname; struct vldbentry *aentry; /* entry data copied here */ @@ -500,7 +500,7 @@ VL_GetEntryByNameO (rxcall, volname, aentry) } -VL_GetEntryByNameN (rxcall, volname, aentry) +SVL_GetEntryByNameN (rxcall, volname, aentry) struct rx_call *rxcall; char *volname; struct nvldbentry *aentry; /* entry data copied here */ @@ -509,7 +509,7 @@ VL_GetEntryByNameN (rxcall, volname, aentry) return (GetEntryByName(rxcall, volname, (char *)aentry, 1, this_op)); } -VL_GetEntryByNameU (rxcall, volname, aentry) +SVL_GetEntryByNameU (rxcall, volname, aentry) struct rx_call *rxcall; char *volname; struct uvldbentry *aentry; /* entry data copied here */ @@ -521,7 +521,7 @@ VL_GetEntryByNameU (rxcall, volname, aentry) /* Get the current value of the maximum volume id and bump the volume id counter by Maxvolidbump. */ -VL_GetNewVolumeId (rxcall, Maxvolidbump, newvolumeid) +SVL_GetNewVolumeId (rxcall, Maxvolidbump, newvolumeid) struct rx_call *rxcall; afs_int32 Maxvolidbump; afs_int32 *newvolumeid; @@ -562,7 +562,7 @@ afs_int32 *newvolumeid; * newentry. No individual checking/updating per field (alike * VLUpdateEntry) is done. */ -VL_ReplaceEntry (rxcall, volid, voltype, newentry, releasetype) +SVL_ReplaceEntry (rxcall, volid, voltype, newentry, releasetype) struct rx_call *rxcall; afs_int32 volid; afs_int32 voltype; @@ -662,7 +662,7 @@ afs_int32 releasetype; return errorcode; } -VL_ReplaceEntryN (rxcall, volid, voltype, newentry, releasetype) +SVL_ReplaceEntryN (rxcall, volid, voltype, newentry, releasetype) struct rx_call *rxcall; afs_int32 volid; afs_int32 voltype; @@ -765,7 +765,7 @@ afs_int32 releasetype; /* Update a vldb entry (accessed thru its volume id). Almost all of the entry's fields can be modified in a single call by setting the appropriate bits in the Mask field in VldbUpdateentry. */ /* this routine may never have been tested; use replace entry instead unless you're brave */ -VL_UpdateEntry (rxcall, volid, voltype, updateentry, releasetype) +SVL_UpdateEntry (rxcall, volid, voltype, updateentry, releasetype) struct rx_call *rxcall; afs_int32 volid; afs_int32 voltype; @@ -813,7 +813,7 @@ VL_UpdateEntry (rxcall, volid, voltype, updateentry, releasetype) } -VL_UpdateEntryByName (rxcall, volname, updateentry, releasetype) +SVL_UpdateEntryByName (rxcall, volname, updateentry, releasetype) struct rx_call *rxcall; char *volname; afs_int32 releasetype; @@ -858,7 +858,7 @@ VL_UpdateEntryByName (rxcall, volname, updateentry, releasetype) /* Set a lock to the vldb entry for volid (of type voltype if not -1). */ -VL_SetLock (rxcall, volid, voltype, voloper) +SVL_SetLock (rxcall, volid, voltype, voloper) struct rx_call *rxcall; afs_int32 volid; afs_int32 voltype; @@ -924,7 +924,7 @@ afs_int32 voloper; * fields (afsid and/or volume operation) will be cleared along with * the lock time stamp. */ -VL_ReleaseLock (rxcall, volid, voltype, releasetype) +SVL_ReleaseLock (rxcall, volid, voltype, releasetype) struct rx_call *rxcall; afs_int32 volid; afs_int32 voltype; @@ -970,7 +970,7 @@ afs_int32 releasetype; /* ListEntry returns a single vldb entry, aentry, with offset previous_index; the remaining parameters (i.e. next_index) are used so that sequential calls to this routine will get the next (all) vldb entries. */ -VL_ListEntry (rxcall, previous_index, count, next_index, aentry) +SVL_ListEntry (rxcall, previous_index, count, next_index, aentry) struct rx_call *rxcall; afs_int32 previous_index; afs_int32 *count; @@ -991,7 +991,7 @@ struct vldbentry *aentry; } /* ListEntry returns a single vldb entry, aentry, with offset previous_index; the remaining parameters (i.e. next_index) are used so that sequential calls to this routine will get the next (all) vldb entries. */ -VL_ListEntryN (rxcall, previous_index, count, next_index, aentry) +SVL_ListEntryN (rxcall, previous_index, count, next_index, aentry) struct rx_call *rxcall; afs_int32 previous_index; afs_int32 *count; @@ -1013,7 +1013,7 @@ struct nvldbentry *aentry; /* Retrieves in vldbentries all vldb entries that match the specified attributes (by server number, partition, volume type, and flag); if volume id is specified then the associated list for that entry is returned. CAUTION: This could be a very expensive call since in most cases sequential search of all vldb entries is performed. */ -VL_ListAttributes(rxcall, attributes, nentries, vldbentries) +SVL_ListAttributes(rxcall, attributes, nentries, vldbentries) struct rx_call *rxcall; struct VldbListByAttributes *attributes; afs_int32 *nentries; @@ -1120,7 +1120,7 @@ bulkentries *vldbentries; return(ubik_EndTrans(trans)); } -VL_ListAttributesN(rxcall, attributes, nentries, vldbentries) +SVL_ListAttributesN(rxcall, attributes, nentries, vldbentries) struct rx_call *rxcall; struct VldbListByAttributes *attributes; afs_int32 *nentries; @@ -1232,7 +1232,7 @@ nbulkentries *vldbentries; } -VL_ListAttributesN2(rxcall, attributes, name, startindex, nentries, vldbentries, nextstartindex) +SVL_ListAttributesN2(rxcall, attributes, name, startindex, nentries, vldbentries, nextstartindex) struct rx_call *rxcall; struct VldbListByAttributes *attributes; char * name; /* Wildcarded volume name */ @@ -1447,7 +1447,7 @@ VL_ListAttributesN2(rxcall, attributes, name, startindex, nentries, vldbentries, * returned. CAUTION: This could be a very expensive call since in most * cases sequential search of all vldb entries is performed. */ -VL_LinkedList(rxcall, attributes, nentries, vldbentries) +SVL_LinkedList(rxcall, attributes, nentries, vldbentries) struct rx_call *rxcall; struct VldbListByAttributes *attributes; afs_int32 *nentries; @@ -1564,7 +1564,7 @@ VL_LinkedList(rxcall, attributes, nentries, vldbentries) return(ubik_EndTrans(trans)); } -VL_LinkedListN(rxcall, attributes, nentries, vldbentries) +SVL_LinkedListN(rxcall, attributes, nentries, vldbentries) struct rx_call *rxcall; struct VldbListByAttributes *attributes; afs_int32 *nentries; @@ -1682,7 +1682,7 @@ VL_LinkedListN(rxcall, attributes, nentries, vldbentries) } /* Get back vldb header statistics (allocs, frees, maxvolumeid, totalentries, etc) and dynamic statistics (number of requests and/or aborts per remote procedure call, etc) */ -VL_GetStats(rxcall, stats, vital_header) +SVL_GetStats(rxcall, stats, vital_header) struct rx_call *rxcall; vldstats *stats; vital_vlheader *vital_header; @@ -1707,7 +1707,7 @@ vital_vlheader *vital_header; * easy to do. In the future, it might require a little bit of grunging * through the VLDB, but that's life. */ -VL_GetAddrs(rxcall, Handle, spare2, spare3, nentries, addrsp) +SVL_GetAddrs(rxcall, Handle, spare2, spare3, nentries, addrsp) struct rx_call *rxcall; afs_int32 Handle, spare2; struct VLCallBack *spare3; @@ -1749,7 +1749,7 @@ bulkaddrs *addrsp; #define PADDR(addr) printf("%d.%d.%d.%d", (addr>>24)&0xff, (addr>>16)&0xff, (addr>>8) &0xff, addr&0xff); -VL_RegisterAddrs(rxcall, uuidp, spare1, addrsp) +SVL_RegisterAddrs(rxcall, uuidp, spare1, addrsp) struct rx_call *rxcall; afsUUID *uuidp; afs_int32 spare1; @@ -2093,7 +2093,7 @@ VL_RegisterAddrs(rxcall, uuidp, spare1, addrsp) return(ubik_EndTrans(trans)); } -VL_GetAddrsU(rxcall, attributes, uuidpo, uniquifier, nentries, addrsp) +SVL_GetAddrsU(rxcall, attributes, uuidpo, uniquifier, nentries, addrsp) struct rx_call *rxcall; struct ListAddrByAttributes *attributes; afsUUID *uuidpo; @@ -2908,7 +2908,7 @@ register afs_uint32 ipaddr1, ipaddr2; } /* see if the vlserver is back yet */ -VL_ProbeServer(rxcall) +SVL_ProbeServer(rxcall) struct rx_call *rxcall; { return 0; } -- 2.39.5