From a5cb7c256b8516dce3319cadf746539c50b09a8c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Love=20H=C3=B6rnquist-=C3=85strand?= Date: Sun, 10 Mar 2002 19:07:56 +0000 Subject: [PATCH] rxgen-prototypes-fixes-20020310 prototype fixes as fallout from rxgen header prototypes emit server stubs which include header as well --- src/bozo/bosoprocs.c | 80 +++++++++++++++++++++--------------------- src/bucoord/commands.c | 1 - src/budb/budb_client.p.h | 44 ----------------------- src/budb/procs.c | 18 +++++----- src/butc/dump.c | 1 - src/butc/lwps.c | 1 - src/butc/tcprocs.c | 18 +++++----- src/butc/tcstatus.c | 8 ++--- src/fsprobe/fsprobe_callback.c | 16 ++++----- src/rxgen/rpc_parse.c | 14 -------- src/sys/rmtsyss.c | 4 +-- src/ubik/beacon.c | 2 +- src/ubik/remote.c | 28 +++++++-------- src/ubik/vote.c | 16 ++++----- src/uss/uss_kauth.c | 1 - src/venus/fs.c | 1 - src/viced/afsfileprocs.c | 76 +++++++++++++++++++-------------------- src/vlserver/vlprocs.c | 58 +++++++++++++++--------------- src/volser/volprocs.c | 2 +- src/xstat/xstat_fs_callback.c | 16 ++++----- 20 files changed, 171 insertions(+), 234 deletions(-) diff --git a/src/bozo/bosoprocs.c b/src/bozo/bosoprocs.c index 4bcae64..79593e9 100644 --- a/src/bozo/bosoprocs.c +++ b/src/bozo/bosoprocs.c @@ -51,7 +51,7 @@ extern int DoLogging; extern int bozo_isrestricted; #endif -SBOZO_GetRestartTime(acall, atype, aktime) +afs_int32 SBOZO_GetRestartTime(acall, atype, aktime) struct rx_call *acall; afs_int32 atype; struct bozo_netKTime *aktime; @@ -76,7 +76,7 @@ SBOZO_GetRestartTime(acall, atype, aktime) return code; } -SBOZO_SetRestartTime(acall, atype, aktime) +afs_int32 SBOZO_SetRestartTime(acall, atype, aktime) struct rx_call *acall; afs_int32 atype; struct bozo_netKTime *aktime; @@ -117,7 +117,7 @@ fail: return code; } -SBOZO_Exec(acall, acmd) +afs_int32 SBOZO_Exec(acall, acmd) struct rx_call *acall; char *acmd; { @@ -145,7 +145,7 @@ fail: return code; } -SBOZO_GetDates(acall, aname, atime, abakTime, aoldTime) +afs_int32 SBOZO_GetDates(acall, aname, atime, abakTime, aoldTime) struct rx_call *acall; char *aname; afs_int32 *atime, *abakTime, *aoldTime; { @@ -180,7 +180,7 @@ afs_int32 *atime, *abakTime, *aoldTime; { return 0; } -SBOZO_UnInstall(acall, aname) +afs_int32 SBOZO_UnInstall(acall, aname) struct rx_call *acall; register char *aname; { char *filepath; @@ -269,7 +269,7 @@ static void SaveOldFiles(char *aname) renamefile(aname, bbuffer); } -SBOZO_Install(acall, aname, asize, mode, amtime) +afs_int32 SBOZO_Install(acall, aname, asize, mode, amtime) struct rx_call *acall; char *aname; afs_int32 asize; @@ -358,7 +358,7 @@ afs_int32 mode; { else return 0; } -SBOZO_SetCellName(acall, aname) +afs_int32 SBOZO_SetCellName(acall, aname) struct rx_call *acall; char *aname; { struct afsconf_cell tcell; @@ -392,7 +392,7 @@ char *aname; { return code; } -SBOZO_GetCellName(acall, aname) +afs_int32 SBOZO_GetCellName(acall, aname) struct rx_call *acall; char **aname; { register afs_int32 code; @@ -412,7 +412,7 @@ char **aname; { return code; } -SBOZO_GetCellHost(acall, awhich, aname) +afs_int32 SBOZO_GetCellHost(acall, awhich, aname) struct rx_call *acall; afs_uint32 awhich; char **aname; { @@ -447,7 +447,7 @@ done: return code; } -SBOZO_DeleteCellHost(acall, aname) +afs_int32 SBOZO_DeleteCellHost(acall, aname) struct rx_call *acall; char *aname; { register afs_int32 code; @@ -490,7 +490,7 @@ char *aname; { return code; } -SBOZO_AddCellHost(acall, aname) +afs_int32 SBOZO_AddCellHost(acall, aname) struct rx_call *acall; char *aname; { register afs_int32 code; @@ -563,9 +563,9 @@ char *aname; { return code; } -SBOZO_ListKeys(acall, an, akvno, akey, akeyinfo) +afs_int32 SBOZO_ListKeys(acall, an, akvno, akey, akeyinfo) struct rx_call *acall; -int an; +afs_int32 an; afs_int32 *akvno; struct bozo_keyInfo *akeyinfo; struct bozo_key *akey; @@ -619,7 +619,7 @@ fail: return code; } -SBOZO_AddKey(acall, an, akey) +afs_int32 SBOZO_AddKey(acall, an, akey) struct rx_call *acall; afs_int32 an; struct bozo_key *akey; { @@ -648,7 +648,7 @@ fail: return code; } -SBOZO_SetNoAuthFlag(acall, aflag) +afs_int32 SBOZO_SetNoAuthFlag(acall, aflag) register struct rx_call *acall; afs_int32 aflag; { register afs_int32 code = 0; @@ -667,7 +667,7 @@ fail: return code; } -SBOZO_DeleteKey(acall, an) +afs_int32 SBOZO_DeleteKey(acall, an) struct rx_call *acall; afs_int32 an; { register afs_int32 code; @@ -687,7 +687,7 @@ fail: } -SBOZO_ListSUsers(acall, an, aname) +afs_int32 SBOZO_ListSUsers(acall, an, aname) struct rx_call *acall; afs_int32 an; register char **aname; { @@ -703,7 +703,7 @@ fail: return code; } -SBOZO_AddSUser(acall, aname) +afs_int32 SBOZO_AddSUser(acall, aname) struct rx_call *acall; char *aname; { register afs_int32 code; @@ -723,7 +723,7 @@ fail: return code; } -SBOZO_DeleteSUser(acall, aname) +afs_int32 SBOZO_DeleteSUser(acall, aname) struct rx_call *acall; char *aname; { register afs_int32 code; @@ -744,7 +744,7 @@ fail: return code; } -SBOZO_CreateBnode(acall, atype, ainstance, ap1, ap2, ap3, ap4, ap5, notifier) +afs_int32 SBOZO_CreateBnode(acall, atype, ainstance, ap1, ap2, ap3, ap4, ap5, notifier) struct rx_call *acall; char *atype; char *ainstance; @@ -779,7 +779,7 @@ char *notifier; { return code; } -SBOZO_WaitAll(acall) +afs_int32 SBOZO_WaitAll(acall) register struct rx_call *acall; { register afs_int32 code; char caller[MAXKTCNAMELEN]; @@ -798,7 +798,7 @@ fail: return code; } -SBOZO_DeleteBnode(acall, ainstance) +afs_int32 SBOZO_DeleteBnode(acall, ainstance) struct rx_call *acall; char *ainstance; { register afs_int32 code; @@ -855,7 +855,7 @@ char *arock; { } /* shutdown and leave down */ -SBOZO_ShutdownAll(acall) +afs_int32 SBOZO_ShutdownAll(acall) struct rx_call *acall; { /* iterate over all bnodes, setting the status to temporarily disabled */ register afs_int32 code; @@ -876,7 +876,7 @@ struct rx_call *acall; { } /* shutdown and restart */ -SBOZO_RestartAll(acall) +afs_int32 SBOZO_RestartAll(acall) struct rx_call *acall; { register afs_int32 code; char caller[MAXKTCNAMELEN]; @@ -903,7 +903,7 @@ struct rx_call *acall; { return code; } -SBOZO_ReBozo(acall) +afs_int32 SBOZO_ReBozo(acall) register struct rx_call *acall; { register afs_int32 code; char caller[MAXKTCNAMELEN]; @@ -938,7 +938,7 @@ fail: } /* make sure all are running */ -SBOZO_StartupAll(acall) +afs_int32 SBOZO_StartupAll(acall) struct rx_call *acall; { register afs_int32 code; char caller[MAXKTCNAMELEN]; @@ -955,7 +955,7 @@ fail: return code; } -SBOZO_Restart(acall, ainstance) +afs_int32 SBOZO_Restart(acall, ainstance) struct rx_call *acall; register char *ainstance; { register struct bnode *tb; @@ -989,7 +989,7 @@ fail: } /* set temp status */ -SBOZO_SetTStatus(acall, ainstance, astatus) +afs_int32 SBOZO_SetTStatus(acall, ainstance, astatus) struct rx_call *acall; char *ainstance; afs_int32 astatus; { @@ -1017,7 +1017,7 @@ fail: return code; } -SBOZO_SetStatus(acall, ainstance, astatus) +afs_int32 SBOZO_SetStatus(acall, ainstance, astatus) struct rx_call *acall; char *ainstance; afs_int32 astatus; { @@ -1046,7 +1046,7 @@ fail: return code; } -SBOZO_GetStatus(acall, ainstance, astat, astatDescr) +afs_int32 SBOZO_GetStatus(acall, ainstance, astat, astatDescr) struct rx_call *acall; char *ainstance; afs_int32 *astat; @@ -1108,7 +1108,7 @@ register char *aname; { return unlink(tbuffer); } -SBOZO_Prune(acall, aflags) +afs_int32 SBOZO_Prune(acall, aflags) struct rx_call *acall; afs_int32 aflags; { register afs_int32 code; @@ -1164,7 +1164,7 @@ afs_int32 aflags; { return code; } -SBOZO_EnumerateInstance(acall, anum, ainstance) +afs_int32 SBOZO_EnumerateInstance(acall, anum, ainstance) struct rx_call *acall; afs_int32 anum; char **ainstance; { @@ -1286,7 +1286,7 @@ int GetRequiredDirPerm (path) return -1; } -SBOZO_GetInstanceInfo(acall, ainstance, atype, astatus) +afs_int32 SBOZO_GetInstanceInfo(acall, ainstance, atype, astatus) IN struct rx_call *acall; IN char *ainstance; OUT char **atype; @@ -1320,7 +1320,7 @@ SBOZO_GetInstanceInfo(acall, ainstance, atype, astatus) return 0; } -SBOZO_GetInstanceParm(acall, ainstance, anum, aparm) +afs_int32 SBOZO_GetInstanceParm(acall, ainstance, anum, aparm) struct rx_call *acall; char *ainstance; afs_int32 anum; @@ -1349,7 +1349,7 @@ char **aparm; { return code; } -SBOZO_GetLog(acall, aname) +afs_int32 SBOZO_GetLog(acall, aname) register struct rx_call *acall; char *aname; { register afs_int32 code; @@ -1411,7 +1411,7 @@ char *aname; { return code; } -SBOZO_GetInstanceStrings(acall, abnodeName, as1, as2, as3, as4) +afs_int32 SBOZO_GetInstanceStrings(acall, abnodeName, as1, as2, as3, as4) struct rx_call *acall; char *abnodeName; char **as1, **as2, **as3, **as4; { @@ -1444,7 +1444,7 @@ char **as1, **as2, **as3, **as4; { } #ifdef BOS_RESTRICTED_MODE -SBOZO_GetRestrictedMode(acall, arestmode) +afs_int32 SBOZO_GetRestrictedMode(acall, arestmode) struct rx_call *acall; afs_int32 *arestmode; { @@ -1452,7 +1452,7 @@ afs_int32 *arestmode; return 0; } -SBOZO_SetRestrictedMode(acall, arestmode) +afs_int32 SBOZO_SetRestrictedMode(acall, arestmode) struct rx_call *acall; afs_int32 arestmode; { @@ -1474,14 +1474,14 @@ afs_int32 arestmode; return code; } #else -SBOZO_GetRestrictedMode(acall, arestmode) +afs_int32 SBOZO_GetRestrictedMode(acall, arestmode) struct rx_call *acall; afs_int32 *arestmode; { return RXGEN_OPCODE; } -SBOZO_SetRestrictedMode(acall, arestmode) +afs_int32 SBOZO_SetRestrictedMode(acall, arestmode) struct rx_call *acall; afs_int32 arestmode; { diff --git a/src/bucoord/commands.c b/src/bucoord/commands.c index 1b4e8a3..b619750 100644 --- a/src/bucoord/commands.c +++ b/src/bucoord/commands.c @@ -2288,7 +2288,6 @@ bc_dbVerifyCmd(as, arock) afs_int32 code = 0; extern struct udbHandleS udbHandle; - extern afs_int32 BUDB_DbVerify(); detail = (as->parms[0].items ? 1 : 0); /* print more details */ diff --git a/src/budb/budb_client.p.h b/src/budb/budb_client.p.h index 2c0691d..f2af7c0 100644 --- a/src/budb/budb_client.p.h +++ b/src/budb/budb_client.p.h @@ -53,48 +53,4 @@ struct udbClientTextS typedef struct udbClientTextS udbClientTextT; typedef udbClientTextT *udbClientTextP; -extern afs_int32 BUDB_AddVolume(); -extern afs_int32 BUDB_AddVolumes(); -extern afs_int32 BUDB_CreateDump (); -extern afs_int32 BUDB_DeleteDump (); -extern afs_int32 BUDB_ListDumps (); -extern afs_int32 BUDB_DeleteTape (); -extern afs_int32 BUDB_DeleteVDP(); -extern afs_int32 BUDB_FindClone(); -extern afs_int32 BUDB_FindDump(); -extern afs_int32 BUDB_FindLatestDump(); -extern afs_int32 BUDB_FindLastTape(); -extern afs_int32 BUDB_MakeDumpAppended(); -extern afs_int32 BUDB_FinishDump (); -extern afs_int32 BUDB_FinishTape (); -extern afs_int32 BUDB_GetDumps (); -extern afs_int32 BUDB_GetTapes (); -extern afs_int32 BUDB_GetVolumes (); -extern afs_int32 BUDB_UseTape (); - -/* text mgmt interface */ -extern afs_int32 BUDB_GetText(); -extern afs_int32 BUDB_GetTextVersion(); -extern afs_int32 BUDB_SaveText(); -extern afs_int32 BUDB_SaveTextVersion(); - -/* text lock mgmt interface */ - -extern afs_int32 BUDB_FreeAllLocks(); -extern afs_int32 BUDB_FreeLock(); -extern afs_int32 BUDB_GetInstanceId(); -extern afs_int32 BUDB_GetLock(); - -/* Database verification and dump */ - -extern afs_int32 BUDB_DbVerify(); -extern afs_int32 BUDB_DumpDB(); -extern afs_int32 BUDB_RestoreDbHeader(); - -/* testing interface */ - -extern afs_int32 BUDB_T_GetVersion(); -extern afs_int32 BUDB_T_DumpHashTable (); -extern afs_int32 BUDB_T_DumpDatabase(); - #endif diff --git a/src/budb/procs.c b/src/budb/procs.c index 6aa8462..57bb72d 100644 --- a/src/budb/procs.c +++ b/src/budb/procs.c @@ -2290,7 +2290,7 @@ afs_int32 FinishTape (call, tape) afs_int32 SBUDB_GetDumps (call, majorVersion, flags, name, start, end, index, nextIndexP, dbTimeP, dumps) struct rx_call *call; - int majorVersion; /* version of interface structures */ + afs_int32 majorVersion; /* version of interface structures */ afs_int32 flags; /* search & select controls */ char *name; /* s&s parameters */ afs_int32 start; @@ -2311,7 +2311,7 @@ afs_int32 SBUDB_GetDumps (call, majorVersion, flags, name, start, end, afs_int32 GetDumps (call, majorVersion, flags, name, start, end, index, nextIndexP, dbTimeP, dumps) struct rx_call *call; - int majorVersion; /* version of interface structures */ + afs_int32 majorVersion; /* version of interface structures */ afs_int32 flags; /* search & select controls */ char *name; /* s&s parameters */ afs_int32 start; @@ -2775,7 +2775,7 @@ afs_int32 FindLastTape (call, dumpID, dumpEntry, tapeEntry, volEntry) afs_int32 SBUDB_GetTapes (call, majorVersion, flags, name, start, end, index, nextIndexP, dbTimeP, tapes) struct rx_call *call; - int majorVersion; /* version of interface structures */ + afs_int32 majorVersion; /* version of interface structures */ afs_int32 flags; /* search & select controls */ char *name; /* s&s parameters */ afs_int32 start; @@ -2796,7 +2796,7 @@ afs_int32 SBUDB_GetTapes (call, majorVersion, flags, name, start, end, index, ne afs_int32 GetTapes (call, majorVersion, flags, name, start, end, index, nextIndexP, dbTimeP, tapes) struct rx_call *call; - int majorVersion; /* version of interface structures */ + afs_int32 majorVersion; /* version of interface structures */ afs_int32 flags; /* search & select controls */ char *name; /* s&s parameters */ afs_int32 start; @@ -2929,7 +2929,7 @@ afs_int32 GetTapes (call, majorVersion, flags, name, start, end, afs_int32 SBUDB_GetVolumes (call, majorVersion, flags, name, start, end, index, nextIndexP, dbTimeP, volumes) struct rx_call *call; - int majorVersion; /* version of interface structures */ + afs_int32 majorVersion; /* version of interface structures */ afs_int32 flags; /* search & select controls */ char *name; /* - parameters for search */ afs_int32 start; /* - usage depends which BUDP_OP_* */ @@ -2950,7 +2950,7 @@ afs_int32 SBUDB_GetVolumes (call, majorVersion, flags, name, start, end, afs_int32 GetVolumes (call, majorVersion, flags, name, start, end, index, nextIndexP, dbTimeP, volumes) struct rx_call *call; - int majorVersion; /* version of interface structures */ + afs_int32 majorVersion; /* version of interface structures */ afs_int32 flags; /* search & select controls */ char *name; /* - parameters for search */ afs_int32 start; /* - usage depends which BUDP_OP_* */ @@ -3108,7 +3108,7 @@ afs_int32 GetVolumes (call, majorVersion, flags, name, start, end, afs_int32 SBUDB_UseTape (call, tape, new) struct rx_call *call; struct budb_tapeEntry *tape; /* tape info */ - int *new; /* set if tape is new */ + afs_int32 *new; /* set if tape is new */ { afs_int32 code; @@ -3200,7 +3200,7 @@ afs_int32 UseTape (call, tape, new) afs_int32 SBUDB_T_DumpHashTable (call, type, filename) struct rx_call *call; - int type; + afs_int32 type; char *filename; { afs_int32 code; @@ -3298,7 +3298,7 @@ afs_int32 T_DumpHashTable (call, type, filename) afs_int32 SBUDB_T_GetVersion (call, majorVersion) struct rx_call *call; - int *majorVersion; + afs_int32 *majorVersion; { afs_int32 code; diff --git a/src/butc/dump.c b/src/butc/dump.c index 7c4448e..63b78b0 100644 --- a/src/butc/dump.c +++ b/src/butc/dump.c @@ -1501,7 +1501,6 @@ getDumpTape(dparamsPtr, interactiveFlag, append) extern struct tapeConfig globalTapeConfig; extern struct udbHandleS udbHandle; - extern afs_int32 BUDB_DeleteDump(); askForTape = interactiveFlag; dparamsPtr->wroteLabel = 0; diff --git a/src/butc/lwps.c b/src/butc/lwps.c index 6cee5a0..2a90a1c 100644 --- a/src/butc/lwps.c +++ b/src/butc/lwps.c @@ -2029,7 +2029,6 @@ updateTapeLabel(labelIfPtr, tapeInfoPtr, newLabelPtr) afs_uint32 taskId; int tapeIsLabeled = 0; int interactiveFlag; - extern afs_int32 BUDB_DeleteDump(); int tapecount = 1; interactiveFlag = autoQuery; diff --git a/src/butc/tcprocs.c b/src/butc/tcprocs.c index 7679985..f5844d2 100644 --- a/src/butc/tcprocs.c +++ b/src/butc/tcprocs.c @@ -69,7 +69,7 @@ callPermitted(call) * ------------------------- */ -STC_LabelTape(acid, label, taskId) +afs_int32 STC_LabelTape(acid, label, taskId) struct rx_call *acid; struct tc_tapeLabel *label; afs_uint32 *taskId; @@ -144,7 +144,7 @@ error_exit: * Tape coordinator server routine to do a dump */ -STC_PerformDump(rxCallId, tcdiPtr, tc_dumpArrayPtr, taskId) +afs_int32 STC_PerformDump(rxCallId, tcdiPtr, tc_dumpArrayPtr, taskId) struct rx_call *rxCallId; struct tc_dumpInterface *tcdiPtr; tc_dumpArray *tc_dumpArrayPtr; @@ -237,7 +237,7 @@ error_exit: return(code); } -STC_PerformRestore(acid, dumpSetName, arestores, taskID) +afs_int32 STC_PerformRestore(acid, dumpSetName, arestores, taskID) struct rx_call *acid; char *dumpSetName; /* not used */ tc_restoreArray *arestores; @@ -311,7 +311,7 @@ error_exit: return(code); } -STC_ReadLabel(acid, label, taskId) +afs_int32 STC_ReadLabel(acid, label, taskId) struct rx_call *acid; struct tc_tapeLabel *label; afs_uint32 *taskId; @@ -335,7 +335,7 @@ STC_ReadLabel(acid, label, taskId) * restore the backup database from tape */ -STC_RestoreDb(rxCall, taskId) +afs_int32 STC_RestoreDb(rxCall, taskId) struct rx_call *rxCall; afs_uint32 *taskId; { @@ -400,7 +400,7 @@ error_exit: * restore the backup database from tape */ -STC_SaveDb(rxCall, archiveTime, taskId) +afs_int32 STC_SaveDb(rxCall, archiveTime, taskId) struct rx_call *rxCall; Date archiveTime; afs_uint32 *taskId; @@ -479,7 +479,7 @@ error_exit: * addDbFlag - if set, the information will be added to the database */ -STC_ScanDumps(acid, addDbFlag, taskId) +afs_int32 STC_ScanDumps(acid, addDbFlag, taskId) struct rx_call *acid; afs_int32 addDbFlag; afs_uint32 *taskId; @@ -553,7 +553,7 @@ error_exit: * is just the version number of the interface */ -STC_TCInfo(acid, tciptr) +afs_int32 STC_TCInfo(acid, tciptr) struct rx_call *acid; struct tc_tcInfo *tciptr; { @@ -566,7 +566,7 @@ STC_TCInfo(acid, tciptr) /* STC_DeleteDump */ -STC_DeleteDump(acid, dumpID, taskId) +afs_int32 STC_DeleteDump(acid, dumpID, taskId) struct rx_call *acid; afs_uint32 dumpID; afs_uint32 *taskId; diff --git a/src/butc/tcstatus.c b/src/butc/tcstatus.c index 20e776f..2869ccf 100644 --- a/src/butc/tcstatus.c +++ b/src/butc/tcstatus.c @@ -47,7 +47,7 @@ struct Lock cmdLineLock; * statusPtr - filled in with task status */ -STC_GetStatus(call, taskId, statusPtr) +afs_int32 STC_GetStatus(call, taskId, statusPtr) struct rx_call *call; afs_uint32 taskId; struct tciStatusS *statusPtr; @@ -81,7 +81,7 @@ STC_GetStatus(call, taskId, statusPtr) return(retval); } -STC_EndStatus(call, taskId ) +afs_int32 STC_EndStatus(call, taskId ) struct rx_call *call; afs_uint32 taskId; { @@ -101,7 +101,7 @@ STC_EndStatus(call, taskId ) return(retval); } -STC_RequestAbort(call, taskId ) +afs_int32 STC_RequestAbort(call, taskId ) struct rx_call *call; afs_uint32 taskId; { @@ -137,7 +137,7 @@ STC_RequestAbort(call, taskId ) * TC_NOTASKS - no tasks active */ -STC_ScanStatus(call, taskId, statusPtr, flags) +afs_int32 STC_ScanStatus(call, taskId, statusPtr, flags) struct rx_call *call; afs_uint32 *taskId; struct tciStatusS *statusPtr; diff --git a/src/fsprobe/fsprobe_callback.c b/src/fsprobe/fsprobe_callback.c index ef95eac..c7f1c07 100644 --- a/src/fsprobe/fsprobe_callback.c +++ b/src/fsprobe/fsprobe_callback.c @@ -443,7 +443,7 @@ afs_int32 SRXAFSCB_GetXStats(rxcall, clientVN, collN, srvVNP, timeP, dataP) * None *------------------------------------------------------------------------*/ -int SRXAFSCB_InitCallBackState2(rxcall, addr) +afs_int32 SRXAFSCB_InitCallBackState2(rxcall, addr) struct rx_call *rxcall; struct interfaceAddr * addr; { @@ -488,7 +488,7 @@ struct interfaceAddr * addr; * As advertised. *------------------------------------------------------------------------*/ -int SRXAFSCB_WhoAreYou(rxcall, addr) +afs_int32 SRXAFSCB_WhoAreYou(rxcall, addr) struct rx_call *rxcall; struct interfaceAddr *addr; { @@ -543,7 +543,7 @@ struct interfaceAddr *addr; * As advertised. *------------------------------------------------------------------------*/ -int SRXAFSCB_InitCallBackState3(rxcall, uuidp) +afs_int32 SRXAFSCB_InitCallBackState3(rxcall, uuidp) struct rx_call *rxcall; afsUUID *uuidp; { @@ -591,7 +591,7 @@ afsUUID *uuidp; * As advertised. *------------------------------------------------------------------------*/ -int SRXAFSCB_ProbeUuid(rxcall, uuidp) +afs_int32 SRXAFSCB_ProbeUuid(rxcall, uuidp) struct rx_call *rxcall; afsUUID *uuidp; { @@ -639,7 +639,7 @@ afsUUID *uuidp; * As advertised. *------------------------------------------------------------------------*/ -int SRXAFSCB_GetServerPrefs( +afs_int32 SRXAFSCB_GetServerPrefs( struct rx_call *a_call, afs_int32 a_index, afs_int32 *a_srvr_addr, @@ -672,7 +672,7 @@ int SRXAFSCB_GetServerPrefs( * As advertised. *------------------------------------------------------------------------*/ -int SRXAFSCB_GetCellServDB( +afs_int32 SRXAFSCB_GetCellServDB( struct rx_call *a_call, afs_int32 a_index, char **a_name, @@ -701,7 +701,7 @@ int SRXAFSCB_GetCellServDB( * As advertised. *------------------------------------------------------------------------*/ -int SRXAFSCB_GetLocalCell( +afs_int32 SRXAFSCB_GetLocalCell( struct rx_call *a_call, char **a_name) { @@ -734,7 +734,7 @@ int SRXAFSCB_GetLocalCell( * As advertised. *------------------------------------------------------------------------*/ -int SRXAFSCB_GetCacheConfig( +afs_int32 SRXAFSCB_GetCacheConfig( struct rx_call *a_call, afs_uint32 callerVersion, afs_uint32 *serverVersion, diff --git a/src/rxgen/rpc_parse.c b/src/rxgen/rpc_parse.c index 825ddf8..5f24aa9 100644 --- a/src/rxgen/rpc_parse.c +++ b/src/rxgen/rpc_parse.c @@ -124,7 +124,6 @@ static cs_ProcTail_setup(); static ss_Proc_CodeGeneration(); static ss_ProcName_setup(); static ss_ProcParams_setup(); -static ss_ProcProto_setup(); static ss_ProcSpecial_setup(); static ss_ProcUnmarshallInParams_setup(); static ss_ProcCallRealProc_setup(); @@ -1353,7 +1352,6 @@ definition *defp; ss_ProcName_setup(defp); if (!cflag) { ss_ProcParams_setup(defp, &somefrees); - ss_ProcProto_setup(defp, &somefrees); ss_ProcSpecial_setup(defp, &somefrees); ss_ProcUnmarshallInParams_setup(defp); ss_ProcCallRealProc_setup(defp); @@ -1451,18 +1449,6 @@ int *somefrees; static -ss_ProcProto_setup(defp, somefrees) -definition *defp; -int *somefrees; -{ - f_print(fout, "#ifndef KERNEL\n"); - f_print(fout, "\tafs_int32 %s%s%s%s();\n", prefix, ServerPrefix, - PackagePrefix[PackageIndex], defp->pc.proc_name); - f_print(fout, "#endif\n"); -} - - -static ss_ProcSpecial_setup(defp, somefrees) definition *defp; int *somefrees; diff --git a/src/sys/rmtsyss.c b/src/sys/rmtsyss.c index 2657b6a..abd9164 100644 --- a/src/sys/rmtsyss.c +++ b/src/sys/rmtsyss.c @@ -87,7 +87,7 @@ rmtsysd() { /* Implements the remote setpag(2) call. Note that unlike the standard call, * here we also get back the new pag value; we need this so that the caller * can add it to its group list via setgroups() */ -int SRMTSYS_SetPag(call, creds, newpag, errornumber) +afs_int32 SRMTSYS_SetPag(call, creds, newpag, errornumber) struct rx_call *call; clientcred *creds; afs_int32 *newpag, *errornumber; @@ -116,7 +116,7 @@ afs_int32 *newpag, *errornumber; /* Implements the remote pioctl(2) call */ -int SRMTSYS_Pioctl(call, creds, path, cmd, follow, InData, OutData, errornumber) +afs_int32 SRMTSYS_Pioctl(call, creds, path, cmd, follow, InData, OutData, errornumber) struct rx_call *call; clientcred *creds; afs_int32 cmd, follow, *errornumber; diff --git a/src/ubik/beacon.c b/src/ubik/beacon.c index f039557..7abd783 100644 --- a/src/ubik/beacon.c +++ b/src/ubik/beacon.c @@ -411,7 +411,7 @@ ubeacon_Interact() { /* now call our own voter module to see if we'll vote for ourself. Note that the same restrictions apply for our voting for ourself as for our voting for anyone else. */ - i = SVOTE_Beacon((struct rx_connection *) 0, ubeacon_AmSyncSite(), startTime, &ubik_dbase->version, &ttid); + i = SVOTE_Beacon((struct rx_call *) 0, ubeacon_AmSyncSite(), startTime, &ubik_dbase->version, &ttid); if (i) { yesVotes += 2; if (amIMagic) yesVotes++; /* extra epsilon */ diff --git a/src/ubik/remote.c b/src/ubik/remote.c index bb5354a..513b4fb 100644 --- a/src/ubik/remote.c +++ b/src/ubik/remote.c @@ -59,7 +59,7 @@ register struct rx_call *acall; { * transactions: this is the code executed on the other servers when a * sync site is executing a write transaction. */ -SDISK_Begin(rxcall, atid) +afs_int32 SDISK_Begin(rxcall, atid) register struct rx_call *rxcall; struct ubik_tid *atid; { @@ -87,7 +87,7 @@ SDISK_Begin(rxcall, atid) return code;} -SDISK_Commit(rxcall, atid) +afs_int32 SDISK_Commit(rxcall, atid) register struct rx_call *rxcall; struct ubik_tid *atid; { @@ -125,7 +125,7 @@ SDISK_Commit(rxcall, atid) return code; } -SDISK_ReleaseLocks(rxcall, atid) +afs_int32 SDISK_ReleaseLocks(rxcall, atid) register struct rx_call *rxcall; struct ubik_tid *atid; { @@ -161,7 +161,7 @@ SDISK_ReleaseLocks(rxcall, atid) return 0; } -SDISK_Abort(rxcall, atid) +afs_int32 SDISK_Abort(rxcall, atid) register struct rx_call *rxcall; struct ubik_tid *atid; { @@ -198,7 +198,7 @@ SDISK_Abort(rxcall, atid) return code; } -SDISK_Lock(rxcall, atid, afile, apos, alen, atype) +afs_int32 SDISK_Lock(rxcall, atid, afile, apos, alen, atype) register struct rx_call *rxcall; struct ubik_tid *atid; afs_int32 afile, apos, alen, atype; /* apos and alen are not used */ @@ -245,7 +245,7 @@ SDISK_Lock(rxcall, atid, afile, apos, alen, atype) } /* Write a vector of data */ -SDISK_WriteV(rxcall, atid, io_vector, io_buffer) +afs_int32 SDISK_WriteV(rxcall, atid, io_vector, io_buffer) register struct rx_call *rxcall; struct ubik_tid *atid; iovec_wrt *io_vector; @@ -294,7 +294,7 @@ SDISK_WriteV(rxcall, atid, io_vector, io_buffer) return code; } -SDISK_Write(rxcall, atid, afile, apos, adata) +afs_int32 SDISK_Write(rxcall, atid, afile, apos, adata) register struct rx_call *rxcall; struct ubik_tid *atid; afs_int32 afile, apos; @@ -326,7 +326,7 @@ SDISK_Write(rxcall, atid, afile, apos, adata) return code; } -SDISK_Truncate(rxcall, atid, afile, alen) +afs_int32 SDISK_Truncate(rxcall, atid, afile, alen) register struct rx_call *rxcall; struct ubik_tid *atid; afs_int32 afile; @@ -358,7 +358,7 @@ SDISK_Truncate(rxcall, atid, afile, alen) return code; } -SDISK_GetVersion(rxcall, aversion) +afs_int32 SDISK_GetVersion(rxcall, aversion) register struct rx_call *rxcall; register struct ubik_version *aversion; { @@ -395,7 +395,7 @@ SDISK_GetVersion(rxcall, aversion) return 0; } -SDISK_GetFile(rxcall, file, version) +afs_int32 SDISK_GetFile(rxcall, file, version) register struct rx_call *rxcall; register afs_int32 file; struct ubik_version *version; @@ -452,7 +452,7 @@ SDISK_GetFile(rxcall, file, version) return code; } -SDISK_SendFile(rxcall, file, length, avers) +afs_int32 SDISK_SendFile(rxcall, file, length, avers) register struct rx_call *rxcall; afs_int32 file; afs_int32 length; @@ -545,7 +545,7 @@ failed: } -SDISK_Probe(rxcall) +afs_int32 SDISK_Probe(rxcall) register struct rx_call *rxcall; { return 0; @@ -556,7 +556,7 @@ SDISK_Probe(rxcall) * Send back my addresses to caller of this RPC * Returns zero on success, else 1. */ -SDISK_UpdateInterfaceAddr(rxcall, inAddr, outAddr) +afs_int32 SDISK_UpdateInterfaceAddr(rxcall, inAddr, outAddr) register struct rx_call *rxcall; UbikInterfaceAddr *inAddr, *outAddr; { @@ -638,7 +638,7 @@ printServerInfo() ubik_print("\n"); } -SDISK_SetVersion(rxcall, atid, oldversionp, newversionp) +afs_int32 SDISK_SetVersion(rxcall, atid, oldversionp, newversionp) struct rx_call *rxcall; struct ubik_tid *atid; struct ubik_version *oldversionp; diff --git a/src/ubik/vote.c b/src/ubik/vote.c index e850aa8..bbf84fd 100644 --- a/src/ubik/vote.c +++ b/src/ubik/vote.c @@ -171,7 +171,7 @@ afs_int32 uvote_GetSyncSite() { * not voting for this sync site, or the time we actually voted yes, if * non-zero. */ -SVOTE_Beacon(rxcall, astate, astart, avers, atid) +afs_int32 SVOTE_Beacon(rxcall, astate, astart, avers, atid) register struct rx_call *rxcall; afs_int32 astate; struct ubik_version *avers; @@ -324,7 +324,7 @@ SVOTE_Beacon(rxcall, astate, astart, avers, atid) /* handle per-server debug command, where 0 is the first server. Basic network debugging hooks. */ -SVOTE_SDebug(rxcall, awhich, aparm) +afs_int32 SVOTE_SDebug(rxcall, awhich, aparm) struct rx_call *rxcall; afs_int32 awhich; register struct ubik_sdebug *aparm; @@ -334,7 +334,7 @@ SVOTE_SDebug(rxcall, awhich, aparm) return code; } -SVOTE_XSDebug(rxcall, awhich, aparm, isclone) +afs_int32 SVOTE_XSDebug(rxcall, awhich, aparm, isclone) afs_int32 *isclone; struct rx_call *rxcall; afs_int32 awhich; @@ -362,7 +362,7 @@ SVOTE_XSDebug(rxcall, awhich, aparm, isclone) return 2; } -SVOTE_XDebug(rxcall, aparm, isclone) +afs_int32 SVOTE_XDebug(rxcall, aparm, isclone) struct rx_call *rxcall; register struct ubik_debug *aparm; afs_int32 *isclone; @@ -375,7 +375,7 @@ SVOTE_XDebug(rxcall, aparm, isclone) } /* handle basic network debug command. This is the global state dumper */ -SVOTE_Debug(rxcall, aparm) +afs_int32 SVOTE_Debug(rxcall, aparm) struct rx_call *rxcall; register struct ubik_debug *aparm; { int i; @@ -432,7 +432,7 @@ SVOTE_Debug(rxcall, aparm) return 0; } -SVOTE_SDebugOld(rxcall, awhich, aparm) +afs_int32 SVOTE_SDebugOld(rxcall, awhich, aparm) struct rx_call *rxcall; afs_int32 awhich; register struct ubik_sdebug_old *aparm; { @@ -457,7 +457,7 @@ SVOTE_SDebugOld(rxcall, awhich, aparm) /* handle basic network debug command. This is the global state dumper */ -SVOTE_DebugOld(rxcall, aparm) +afs_int32 SVOTE_DebugOld(rxcall, aparm) struct rx_call *rxcall; register struct ubik_debug_old *aparm; { @@ -512,7 +512,7 @@ SVOTE_DebugOld(rxcall, aparm) /* get the sync site; called by remote servers to find where they should go */ -SVOTE_GetSyncSite(rxcall, ahost) +afs_int32 SVOTE_GetSyncSite(rxcall, ahost) register struct rx_call *rxcall; register afs_int32 *ahost; { register afs_int32 temp; diff --git a/src/uss/uss_kauth.c b/src/uss/uss_kauth.c index f95cbb9..9eb76f4 100644 --- a/src/uss/uss_kauth.c +++ b/src/uss/uss_kauth.c @@ -29,7 +29,6 @@ RCSID("$Header$"); #include /* pack_long */ extern int errno; -extern afs_int32 KAM_CreateUser(); #define uss_kauth_MAX_SIZE 2048 diff --git a/src/venus/fs.c b/src/venus/fs.c index dbc27cd..05e5ed6 100644 --- a/src/venus/fs.c +++ b/src/venus/fs.c @@ -64,7 +64,6 @@ static int RxStatProcCmd(), RxStatPeerCmd(); extern char *hostutil_GetNameByINet(); extern struct hostent *hostutil_GetHostByName(); -extern afs_int32 VL_GetEntryByNameO(); extern int errno; extern struct cmd_syndesc *cmd_CreateSyntax(); diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c index 8812813..e82fdd6 100644 --- a/src/viced/afsfileprocs.c +++ b/src/viced/afsfileprocs.c @@ -440,7 +440,7 @@ static int VolumeRootVnode (targetptr) } /*VolumeRootVnode*/ -SRXAFS_FetchData (acall, Fid, Pos, Len, OutStatus, CallBack, Sync) +afs_int32 SRXAFS_FetchData (acall, Fid, Pos, Len, OutStatus, CallBack, Sync) struct rx_call *acall; /* Rx call */ struct AFSFid *Fid; /* Fid of file to fetch */ afs_int32 Pos, Len; /* Not implemented yet */ @@ -456,7 +456,7 @@ SRXAFS_FetchData (acall, Fid, Pos, Len, OutStatus, CallBack, Sync) return code; } -SRXAFS_FetchData64 (acall, Fid, Pos, Len, OutStatus, CallBack, Sync) +afs_int32 SRXAFS_FetchData64 (acall, Fid, Pos, Len, OutStatus, CallBack, Sync) struct rx_call *acall; /* Rx call */ struct AFSFid *Fid; /* Fid of file to fetch */ afs_int64 Pos, Len; /* Not implemented yet */ @@ -722,7 +722,7 @@ Bad_FetchData: } /*SRXAFS_FetchData*/ -SRXAFS_FetchACL (acall, Fid, AccessList, OutStatus, Sync) +afs_int32 SRXAFS_FetchACL (acall, Fid, AccessList, OutStatus, Sync) struct rx_call *acall; /* Rx call */ struct AFSFid *Fid; /* Fid of target dir */ struct AFSOpaque *AccessList; /* Returned contents of dir's ACL */ @@ -904,7 +904,7 @@ Bad_FetchStatus: } /*SAFSS_FetchStatus*/ -SRXAFS_BulkStatus(acall, Fids, OutStats, CallBacks, Sync) +afs_int32 SRXAFS_BulkStatus(acall, Fids, OutStats, CallBacks, Sync) struct rx_call *acall; struct AFSCBFids *Fids; struct AFSBulkStats *OutStats; @@ -1041,7 +1041,7 @@ Audit_and_Return: } /*SRXAFS_BulkStatus*/ -SRXAFS_InlineBulkStatus(acall, Fids, OutStats, CallBacks, Sync) +afs_int32 SRXAFS_InlineBulkStatus(acall, Fids, OutStats, CallBacks, Sync) struct rx_call *acall; struct AFSCBFids *Fids; struct AFSBulkStats *OutStats; @@ -1190,7 +1190,7 @@ Audit_and_Return: } /*SRXAFS_InlineBulkStatus*/ -SRXAFS_FetchStatus (acall, Fid, OutStatus, CallBack, Sync) +afs_int32 SRXAFS_FetchStatus (acall, Fid, OutStatus, CallBack, Sync) struct rx_call *acall; /* Rx call */ struct AFSFid *Fid; /* Fid of target file */ struct AFSFetchStatus *OutStatus; /* Returned status for the fid */ @@ -1249,7 +1249,7 @@ Bad_FetchStatus: } /*SRXAFS_FetchStatus*/ -SRXAFS_StoreData (acall, Fid, InStatus, Pos, Length, FileLength, OutStatus, Sync) +afs_int32 SRXAFS_StoreData (acall, Fid, InStatus, Pos, Length, FileLength, OutStatus, Sync) struct rx_call *acall; /* Rx call */ struct AFSFid *Fid; /* Fid of taret file */ struct AFSStoreStatus *InStatus; /* Input Status for Fid */ @@ -1481,7 +1481,7 @@ Bad_StoreData: } /*SRXAFS_StoreData*/ -SRXAFS_StoreData64 (acall, Fid, InStatus, Pos, Length, FileLength, OutStatus, Sync) +afs_int32 SRXAFS_StoreData64 (acall, Fid, InStatus, Pos, Length, FileLength, OutStatus, Sync) struct rx_call *acall; /* Rx call */ struct AFSFid *Fid; /* Fid of taret file */ struct AFSStoreStatus *InStatus; /* Input Status for Fid */ @@ -1515,7 +1515,7 @@ SRXAFS_StoreData64 (acall, Fid, InStatus, Pos, Length, FileLength, OutStatus, Sy return code; } -SRXAFS_StoreACL (acall, Fid, AccessList, OutStatus, Sync) +afs_int32 SRXAFS_StoreACL (acall, Fid, AccessList, OutStatus, Sync) struct rx_call *acall; /* Rx call */ struct AFSFid *Fid; /* Target dir's fid */ struct AFSOpaque *AccessList; /* Access List's contents */ @@ -1711,7 +1711,7 @@ Bad_StoreStatus: } /*SAFSS_StoreStatus*/ -SRXAFS_StoreStatus (acall, Fid, InStatus, OutStatus, Sync) +afs_int32 SRXAFS_StoreStatus (acall, Fid, InStatus, OutStatus, Sync) struct rx_call *acall; /* Rx call */ struct AFSFid *Fid; /* Target file's fid */ struct AFSStoreStatus *InStatus; /* Input status for Fid */ @@ -1869,7 +1869,7 @@ Bad_RemoveFile: } /*SAFSS_RemoveFile*/ -SRXAFS_RemoveFile (acall, DirFid, Name, OutDirStatus, Sync) +afs_int32 SRXAFS_RemoveFile (acall, DirFid, Name, OutDirStatus, Sync) struct rx_call *acall; /* Rx call */ struct AFSFid *DirFid; /* Dir fid for file to remove */ char *Name; /* File name to remove */ @@ -2030,7 +2030,7 @@ Bad_CreateFile: } /*SAFSS_CreateFile*/ -SRXAFS_CreateFile (acall, DirFid, Name, InStatus, OutFid, OutFidStatus, OutDirStatus, CallBack, Sync) +afs_int32 SRXAFS_CreateFile (acall, DirFid, Name, InStatus, OutFid, OutFidStatus, OutDirStatus, CallBack, Sync) struct rx_call *acall; /* Rx call */ struct AFSFid *DirFid; /* Parent Dir fid */ char *Name; /* File name to be created */ @@ -2490,7 +2490,7 @@ Bad_Rename: } /*SAFSS_Rename*/ -SRXAFS_Rename (acall, OldDirFid, OldName, NewDirFid, NewName, OutOldDirStatus, OutNewDirStatus, Sync) +afs_int32 SRXAFS_Rename (acall, OldDirFid, OldName, NewDirFid, NewName, OutOldDirStatus, OutNewDirStatus, Sync) struct rx_call *acall; /* Rx call */ struct AFSFid *OldDirFid; /* From parent dir's fid */ char *OldName; /* From file name */ @@ -2680,7 +2680,7 @@ Bad_SymLink: } /*SAFSS_Symlink*/ -SRXAFS_Symlink (acall, DirFid, Name, LinkContents, InStatus, OutFid, OutFidStatus, OutDirStatus, Sync) +afs_int32 SRXAFS_Symlink (acall, DirFid, Name, LinkContents, InStatus, OutFid, OutFidStatus, OutDirStatus, Sync) struct AFSVolSync *Sync; struct rx_call *acall; /* Rx call */ struct AFSFid *DirFid; /* Parent dir's fid */ @@ -2881,7 +2881,7 @@ Bad_Link: } /*SAFSS_Link*/ -SRXAFS_Link (acall, DirFid, Name, ExistingFid, OutFidStatus, OutDirStatus, Sync) +afs_int32 SRXAFS_Link (acall, DirFid, Name, ExistingFid, OutFidStatus, OutDirStatus, Sync) struct rx_call *acall; /* Rx call */ struct AFSFid *DirFid; /* Parent dir's fid */ char *Name; /* File name to create */ @@ -3074,7 +3074,7 @@ Bad_MakeDir: } /*SAFSS_MakeDir*/ -SRXAFS_MakeDir (acall, DirFid, Name, InStatus, OutFid, OutFidStatus, OutDirStatus, CallBack, Sync) +afs_int32 SRXAFS_MakeDir (acall, DirFid, Name, InStatus, OutFid, OutFidStatus, OutDirStatus, CallBack, Sync) struct rx_call *acall; /* Rx call */ struct AFSFid *DirFid; /* Parent dir's fid */ char *Name; /* Name of dir to be created */ @@ -3233,7 +3233,7 @@ Bad_RemoveDir: } /*SAFSS_RemoveDir*/ -SRXAFS_RemoveDir (acall, DirFid, Name, OutDirStatus, Sync) +afs_int32 SRXAFS_RemoveDir (acall, DirFid, Name, OutDirStatus, Sync) struct rx_call *acall; /* Rx call */ struct AFSFid *DirFid; /* Parent dir's fid */ char *Name; /* (Empty) dir's name to be removed */ @@ -3357,7 +3357,7 @@ Bad_SetLock: } /*SAFSS_SetLock*/ -SRXAFS_OldSetLock(acall, Fid, type, Sync) +afs_int32 SRXAFS_OldSetLock(acall, Fid, type, Sync) struct rx_call *acall; /* Rx call */ struct AFSFid *Fid; /* Fid of file to lock */ ViceLockType type; /* Type of lock (Read or write) */ @@ -3368,7 +3368,7 @@ SRXAFS_OldSetLock(acall, Fid, type, Sync) } /*SRXAFS_OldSetLock*/ -SRXAFS_SetLock (acall, Fid, type, Sync) +afs_int32 SRXAFS_SetLock (acall, Fid, type, Sync) struct rx_call *acall; /* Rx call */ struct AFSFid *Fid; /* Fid of file to lock */ ViceLockType type; /* Type of lock (Read or write) */ @@ -3483,7 +3483,7 @@ Bad_ExtendLock: } /*SAFSS_ExtendLock*/ -SRXAFS_OldExtendLock (acall, Fid, Sync) +afs_int32 SRXAFS_OldExtendLock (acall, Fid, Sync) struct rx_call *acall; /* Rx call */ struct AFSFid *Fid; /* Fid of file whose lock we extend */ struct AFSVolSync *Sync; @@ -3493,7 +3493,7 @@ SRXAFS_OldExtendLock (acall, Fid, Sync) } /*SRXAFS_OldExtendLock*/ -SRXAFS_ExtendLock (acall, Fid, Sync) +afs_int32 SRXAFS_ExtendLock (acall, Fid, Sync) struct rx_call *acall; /* Rx call */ struct AFSFid *Fid; /* Fid of file whose lock we extend */ struct AFSVolSync *Sync; @@ -3617,7 +3617,7 @@ Bad_ReleaseLock: } /*SAFSS_ReleaseLock*/ -SRXAFS_OldReleaseLock (acall, Fid, Sync) +afs_int32 SRXAFS_OldReleaseLock (acall, Fid, Sync) struct rx_call *acall; /* Rx call */ struct AFSFid *Fid; /* Fid of file to release lock */ struct AFSVolSync *Sync; @@ -3627,7 +3627,7 @@ SRXAFS_OldReleaseLock (acall, Fid, Sync) } /*SRXAFS_OldReleaseLock*/ -SRXAFS_ReleaseLock (acall, Fid, Sync) +afs_int32 SRXAFS_ReleaseLock (acall, Fid, Sync) struct rx_call *acall; /* Rx call */ struct AFSFid *Fid; /* Fid of file to release lock */ struct AFSVolSync *Sync; @@ -3706,7 +3706,7 @@ static GetStatistics (acall, Statistics) } /*GetStatistics*/ -SRXAFS_GetStatistics (acall, Statistics) +afs_int32 SRXAFS_GetStatistics (acall, Statistics) struct rx_call *acall; /* Rx call */ struct ViceStatistics *Statistics; /* Placeholder for returned AFS statistics */ @@ -3781,7 +3781,7 @@ Bad_GetStatistics: * As advertised. *------------------------------------------------------------------------*/ -int SRXAFS_XStatsVersion(a_call, a_versionP) +afs_int32 SRXAFS_XStatsVersion(a_call, a_versionP) struct rx_call *a_call; afs_int32 *a_versionP; @@ -4008,7 +4008,7 @@ static void FillPerfValues(a_perfP) * As advertised. *------------------------------------------------------------------------*/ -int SRXAFS_GetXStats(a_call, a_clientVersionNum, a_collectionNumber, a_srvVersionNumP, a_timeP, a_dataP) +afs_int32 SRXAFS_GetXStats(a_call, a_clientVersionNum, a_collectionNumber, a_srvVersionNumP, a_timeP, a_dataP) struct rx_call *a_call; afs_int32 a_clientVersionNum; afs_int32 a_collectionNumber; @@ -4169,7 +4169,7 @@ int SRXAFS_GetXStats(a_call, a_clientVersionNum, a_collectionNumber, a_srvVersio } /*SRXAFS_GetXStats*/ -SRXAFS_GiveUpCallBacks (acall, FidArray, CallBackArray) +afs_int32 SRXAFS_GiveUpCallBacks (acall, FidArray, CallBackArray) struct rx_call *acall; /* Rx call */ struct AFSCBFids *FidArray; /* Array of Fids entries */ struct AFSCBs *CallBackArray; /* array of callbacks */ @@ -4245,7 +4245,7 @@ out: } /*SRXAFS_GiveUpCallBacks*/ -SRXAFS_NGetVolumeInfo (acall, avolid, avolinfo) +afs_int32 SRXAFS_NGetVolumeInfo (acall, avolid, avolinfo) struct rx_call *acall; /* Rx call */ char *avolid; /* Volume name/id */ struct AFSVolumeInfo *avolinfo; /* Returned volume's specific info */ @@ -4261,7 +4261,7 @@ SRXAFS_NGetVolumeInfo (acall, avolid, avolinfo) * invoke this interface when communicating with a AFS/DFS Protocol * Translator). */ -SRXAFS_Lookup(call_p, afs_dfid_p, afs_name_p, afs_fid_p, +afs_int32 SRXAFS_Lookup(call_p, afs_dfid_p, afs_name_p, afs_fid_p, afs_status_p, afs_dir_status_p, afs_callback_p, afs_sync_p) struct rx_call *call_p; /* Rx call handle */ struct AFSFid *afs_dfid_p; /* Directory */ @@ -4276,7 +4276,7 @@ SRXAFS_Lookup(call_p, afs_dfid_p, afs_name_p, afs_fid_p, } -SRXAFS_FlushCPS(acall, vids, addrs, spare1, spare2, spare3) +afs_int32 SRXAFS_FlushCPS(acall, vids, addrs, spare1, spare2, spare3) struct rx_call *acall; struct ViceIds *vids; struct IPAddrs *addrs; @@ -4474,7 +4474,7 @@ static TryLocalVLServer(avolid, avolinfo) } -SRXAFS_GetVolumeInfo (acall, avolid, avolinfo) +afs_int32 SRXAFS_GetVolumeInfo (acall, avolid, avolinfo) struct rx_call *acall; /* Rx call */ char *avolid; /* Volume name/id */ struct VolumeInfo *avolinfo; /* Returned volume's specific info */ @@ -4531,7 +4531,7 @@ Bad_GetVolumeInfo: } /*SRXAFS_GetVolumeInfo*/ -SRXAFS_GetVolumeStatus (acall, avolid, FetchVolStatus, Name, OfflineMsg, Motd) +afs_int32 SRXAFS_GetVolumeStatus (acall, avolid, FetchVolStatus, Name, OfflineMsg, Motd) struct rx_call *acall; /* Rx call */ afs_int32 avolid; /* Volume's id */ AFSFetchVolumeStatus *FetchVolStatus; /* Place to hold volume's status info */ @@ -4622,7 +4622,7 @@ Bad_GetVolumeStatus: } /*SRXAFS_GetVolumeStatus*/ -SRXAFS_SetVolumeStatus (acall, avolid, StoreVolStatus, Name, OfflineMsg, Motd) +afs_int32 SRXAFS_SetVolumeStatus (acall, avolid, StoreVolStatus, Name, OfflineMsg, Motd) struct rx_call *acall; /* Rx call */ afs_int32 avolid; /* Volume's id */ AFSStoreVolumeStatus *StoreVolStatus; /* Adjusted output volume's status */ @@ -4715,7 +4715,7 @@ SRXAFS_SetVolumeStatus (acall, avolid, StoreVolStatus, Name, OfflineMsg, Motd) #define DEFAULTVOLUME "root.afs" -SRXAFS_GetRootVolume (acall, VolumeName) +afs_int32 SRXAFS_GetRootVolume (acall, VolumeName) struct rx_call *acall; /* Rx call */ char **VolumeName; /* Returned AFS's root volume name */ @@ -4801,7 +4801,7 @@ Bad_GetRootVolume: /* still works because a struct CBS is the same as a struct AFSOpaque */ -SRXAFS_CheckToken (acall, AfsId, Token) +afs_int32 SRXAFS_CheckToken (acall, AfsId, Token) struct rx_call *acall; /* Rx call */ afs_int32 AfsId; /* AFS id whose token we verify */ struct AFSOpaque *Token; /* Token value for used Afsid */ @@ -4880,7 +4880,7 @@ static GetTime (acall, Seconds, USeconds) } /*GetTime*/ -SRXAFS_GetTime (acall, Seconds, USeconds) +afs_int32 SRXAFS_GetTime (acall, Seconds, USeconds) struct rx_call *acall; /* Rx call */ afs_uint32 *Seconds; /* Returned time in seconds */ afs_uint32 *USeconds; /* Returned leftovers in useconds */ @@ -7147,7 +7147,7 @@ PrintVolumeStatus(status) * and is not supported by the AFS fileserver. We just return EINVAL. * The cache manager should not generate this call to an AFS cache manager. */ -SRXAFS_DFSSymlink (acall, DirFid, Name, LinkContents, InStatus, OutFid, OutFidStatus, OutDirStatus, CallBack, Sync) +afs_int32 SRXAFS_DFSSymlink (acall, DirFid, Name, LinkContents, InStatus, OutFid, OutFidStatus, OutDirStatus, CallBack, Sync) struct rx_call *acall; /* Rx call */ struct AFSFid *DirFid; /* Parent dir's fid */ char *Name; /* File name to create */ @@ -7162,7 +7162,7 @@ SRXAFS_DFSSymlink (acall, DirFid, Name, LinkContents, InStatus, OutFid, OutFidSt return EINVAL; } -SRXAFS_ResidencyCmd (acall, Fid, Inputs, Outputs) +afs_int32 SRXAFS_ResidencyCmd (acall, Fid, Inputs, Outputs) struct rx_call *acall; struct AFSFid *Fid; struct ResidencyCmdInputs *Inputs; diff --git a/src/vlserver/vlprocs.c b/src/vlserver/vlprocs.c index bcd35bf..8a21725 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). */ -SVL_CreateEntry(rxcall, newentry) +afs_int32 SVL_CreateEntry(rxcall, newentry) struct rx_call *rxcall; struct vldbentry *newentry; { struct ubik_trans *trans; @@ -221,7 +221,7 @@ SVL_CreateEntry(rxcall, newentry) } -SVL_CreateEntryN(rxcall, newentry) +afs_int32 SVL_CreateEntryN(rxcall, newentry) struct rx_call *rxcall; struct nvldbentry *newentry; { struct ubik_trans *trans; @@ -294,7 +294,7 @@ SVL_CreateEntryN(rxcall, newentry) } -SVL_ChangeAddr(rxcall, ip1, ip2) +afs_int32 SVL_ChangeAddr(rxcall, ip1, ip2) struct rx_call *rxcall; afs_int32 ip1, ip2; { struct ubik_trans *trans; @@ -328,7 +328,7 @@ SVL_ChangeAddr(rxcall, ip1, ip2) } /* Delete a vldb entry given the volume id. */ -SVL_DeleteEntry(rxcall, volid, voltype) +afs_int32 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)); } -SVL_GetEntryByID (rxcall, volid, voltype, aentry) +afs_int32 SVL_GetEntryByID (rxcall, volid, voltype, aentry) struct rx_call *rxcall; afs_int32 volid, voltype; vldbentry *aentry; /* entry data copied here */ @@ -419,7 +419,7 @@ SVL_GetEntryByID (rxcall, volid, voltype, aentry) return (GetEntryByID(rxcall, volid, voltype, (char *)aentry, 0, this_op)); } -SVL_GetEntryByIDN (rxcall, volid, voltype, aentry) +afs_int32 SVL_GetEntryByIDN (rxcall, volid, voltype, aentry) struct rx_call *rxcall; afs_int32 volid, voltype; nvldbentry *aentry; /* entry data copied here */ @@ -428,7 +428,7 @@ SVL_GetEntryByIDN (rxcall, volid, voltype, aentry) return (GetEntryByID(rxcall, volid, voltype, (char *)aentry, 1, this_op)); } -SVL_GetEntryByIDU (rxcall, volid, voltype, aentry) +afs_int32 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)); } -SVL_GetEntryByNameO (rxcall, volname, aentry) +afs_int32 SVL_GetEntryByNameO (rxcall, volname, aentry) struct rx_call *rxcall; char *volname; struct vldbentry *aentry; /* entry data copied here */ @@ -500,7 +500,7 @@ SVL_GetEntryByNameO (rxcall, volname, aentry) } -SVL_GetEntryByNameN (rxcall, volname, aentry) +afs_int32 SVL_GetEntryByNameN (rxcall, volname, aentry) struct rx_call *rxcall; char *volname; struct nvldbentry *aentry; /* entry data copied here */ @@ -509,7 +509,7 @@ SVL_GetEntryByNameN (rxcall, volname, aentry) return (GetEntryByName(rxcall, volname, (char *)aentry, 1, this_op)); } -SVL_GetEntryByNameU (rxcall, volname, aentry) +afs_int32 SVL_GetEntryByNameU (rxcall, volname, aentry) struct rx_call *rxcall; char *volname; struct uvldbentry *aentry; /* entry data copied here */ @@ -521,7 +521,7 @@ SVL_GetEntryByNameU (rxcall, volname, aentry) /* Get the current value of the maximum volume id and bump the volume id counter by Maxvolidbump. */ -SVL_GetNewVolumeId (rxcall, Maxvolidbump, newvolumeid) +afs_int32 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. */ -SVL_ReplaceEntry (rxcall, volid, voltype, newentry, releasetype) +afs_int32 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; } -SVL_ReplaceEntryN (rxcall, volid, voltype, newentry, releasetype) +afs_int32 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 */ -SVL_UpdateEntry (rxcall, volid, voltype, updateentry, releasetype) +afs_int32 SVL_UpdateEntry (rxcall, volid, voltype, updateentry, releasetype) struct rx_call *rxcall; afs_int32 volid; afs_int32 voltype; @@ -813,7 +813,7 @@ SVL_UpdateEntry (rxcall, volid, voltype, updateentry, releasetype) } -SVL_UpdateEntryByName (rxcall, volname, updateentry, releasetype) +afs_int32 SVL_UpdateEntryByName (rxcall, volname, updateentry, releasetype) struct rx_call *rxcall; char *volname; afs_int32 releasetype; @@ -858,7 +858,7 @@ SVL_UpdateEntryByName (rxcall, volname, updateentry, releasetype) /* Set a lock to the vldb entry for volid (of type voltype if not -1). */ -SVL_SetLock (rxcall, volid, voltype, voloper) +afs_int32 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. */ -SVL_ReleaseLock (rxcall, volid, voltype, releasetype) +afs_int32 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. */ -SVL_ListEntry (rxcall, previous_index, count, next_index, aentry) +afs_int32 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. */ -SVL_ListEntryN (rxcall, previous_index, count, next_index, aentry) +afs_int32 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. */ -SVL_ListAttributes(rxcall, attributes, nentries, vldbentries) +afs_int32 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)); } -SVL_ListAttributesN(rxcall, attributes, nentries, vldbentries) +afs_int32 SVL_ListAttributesN(rxcall, attributes, nentries, vldbentries) struct rx_call *rxcall; struct VldbListByAttributes *attributes; afs_int32 *nentries; @@ -1232,7 +1232,7 @@ nbulkentries *vldbentries; } -SVL_ListAttributesN2(rxcall, attributes, name, startindex, nentries, vldbentries, nextstartindex) +afs_int32 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 @@ SVL_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. */ -SVL_LinkedList(rxcall, attributes, nentries, vldbentries) +afs_int32 SVL_LinkedList(rxcall, attributes, nentries, vldbentries) struct rx_call *rxcall; struct VldbListByAttributes *attributes; afs_int32 *nentries; @@ -1564,7 +1564,7 @@ SVL_LinkedList(rxcall, attributes, nentries, vldbentries) return(ubik_EndTrans(trans)); } -SVL_LinkedListN(rxcall, attributes, nentries, vldbentries) +afs_int32 SVL_LinkedListN(rxcall, attributes, nentries, vldbentries) struct rx_call *rxcall; struct VldbListByAttributes *attributes; afs_int32 *nentries; @@ -1682,7 +1682,7 @@ SVL_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) */ -SVL_GetStats(rxcall, stats, vital_header) +afs_int32 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. */ -SVL_GetAddrs(rxcall, Handle, spare2, spare3, nentries, addrsp) +afs_int32 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); -SVL_RegisterAddrs(rxcall, uuidp, spare1, addrsp) +afs_int32 SVL_RegisterAddrs(rxcall, uuidp, spare1, addrsp) struct rx_call *rxcall; afsUUID *uuidp; afs_int32 spare1; @@ -2093,7 +2093,7 @@ SVL_RegisterAddrs(rxcall, uuidp, spare1, addrsp) return(ubik_EndTrans(trans)); } -SVL_GetAddrsU(rxcall, attributes, uuidpo, uniquifier, nentries, addrsp) +afs_int32 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 */ -SVL_ProbeServer(rxcall) +afs_int32 SVL_ProbeServer(rxcall) struct rx_call *rxcall; { return 0; } diff --git a/src/volser/volprocs.c b/src/volser/volprocs.c index 547e99a..8fb0fe2 100644 --- a/src/volser/volprocs.c +++ b/src/volser/volprocs.c @@ -1286,7 +1286,7 @@ afs_int32 fromDate; */ afs_int32 SAFSVolRestore (acid, atrans, aflags,cookie) struct rx_call *acid; -int aflags; +afs_int32 aflags; afs_int32 atrans; struct restoreCookie *cookie; { diff --git a/src/xstat/xstat_fs_callback.c b/src/xstat/xstat_fs_callback.c index b1d8f5e..45c352a 100644 --- a/src/xstat/xstat_fs_callback.c +++ b/src/xstat/xstat_fs_callback.c @@ -451,7 +451,7 @@ afs_int32 SRXAFSCB_GetXStats(rxcall, clientVersionNumber, collectionNumber, * None *------------------------------------------------------------------------*/ -int SRXAFSCB_InitCallBackState2(rxcall, addr) +afs_int32 SRXAFSCB_InitCallBackState2(rxcall, addr) struct rx_call *rxcall; struct interfaceAddr * addr; { @@ -496,7 +496,7 @@ struct interfaceAddr * addr; * As advertised. *------------------------------------------------------------------------*/ -int SRXAFSCB_WhoAreYou(rxcall, addr) +afs_int32 SRXAFSCB_WhoAreYou(rxcall, addr) struct rx_call *rxcall; struct interfaceAddr *addr; { @@ -551,7 +551,7 @@ struct interfaceAddr *addr; * As advertised. *------------------------------------------------------------------------*/ -int SRXAFSCB_InitCallBackState3(rxcall, uuidp) +afs_int32 SRXAFSCB_InitCallBackState3(rxcall, uuidp) struct rx_call *rxcall; afsUUID *uuidp; { @@ -599,7 +599,7 @@ afsUUID *uuidp; * As advertised. *------------------------------------------------------------------------*/ -int SRXAFSCB_ProbeUuid(rxcall, uuidp) +afs_int32 SRXAFSCB_ProbeUuid(rxcall, uuidp) struct rx_call *rxcall; afsUUID *uuidp; { @@ -647,7 +647,7 @@ afsUUID *uuidp; * As advertised. *------------------------------------------------------------------------*/ -int SRXAFSCB_GetServerPrefs( +afs_int32 SRXAFSCB_GetServerPrefs( struct rx_call *a_call, afs_int32 a_index, afs_int32 *a_srvr_addr, @@ -678,7 +678,7 @@ int SRXAFSCB_GetServerPrefs( * As advertised. *------------------------------------------------------------------------*/ -int SRXAFSCB_GetCellServDB( +afs_int32 SRXAFSCB_GetCellServDB( struct rx_call *a_call, afs_int32 a_index, char **a_name, @@ -708,7 +708,7 @@ int SRXAFSCB_GetCellServDB( * As advertised. *------------------------------------------------------------------------*/ -int SRXAFSCB_GetLocalCell( +afs_int32 SRXAFSCB_GetLocalCell( struct rx_call *a_call, char **a_name) { @@ -748,7 +748,7 @@ int SRXAFSCB_GetLocalCell( * As advertised. *------------------------------------------------------------------------*/ -int SRXAFSCB_GetCacheConfig( +afs_int32 SRXAFSCB_GetCacheConfig( struct rx_call *a_call, afs_uint32 callerVersion, afs_uint32 *serverVersion, -- 1.9.4