Fix more build problems due to prototypes produced by rxgen.

diff --git a/src/bozo/bosint.xg b/src/bozo/bosint.xg
index fef2f4d..841f082 100644 (file)
--- a/src/bozo/bosint.xg
+++ b/src/bozo/bosint.xg
@@ -52,6 +52,7 @@ struct bozo_status {
 %#define BOZO_PRUNECORE                4       /* prune core files */
 
 package BOZO_
+prefix S
 statindex 1
 
 CreateBnode(

diff --git a/src/bozo/bosoprocs.c b/src/bozo/bosoprocs.c
index 1481394..4bcae64 100644 (file)
--- a/src/bozo/bosoprocs.c
+++ b/src/bozo/bosoprocs.c
@@ -51,10 +51,11 @@ extern int DoLogging;
 extern int bozo_isrestricted;
 #endif
 
-BOZO_GetRestartTime(acall, atype, aktime)
-struct rx_call *acall;
-afs_int32 atype;
-struct ktime *aktime; {
+SBOZO_GetRestartTime(acall, atype, aktime)
+    struct rx_call *acall;
+    afs_int32 atype;
+    struct bozo_netKTime *aktime;
+{
     register afs_int32 code;
 
     code = 0;          /* assume success */
@@ -75,10 +76,11 @@ struct ktime *aktime; {
     return code;
 }
 
-BOZO_SetRestartTime(acall, atype, aktime)
-struct rx_call *acall;
-afs_int32 atype;
-struct ktime *aktime; {
+SBOZO_SetRestartTime(acall, atype, aktime)
+    struct rx_call *acall;
+    afs_int32 atype;
+    struct bozo_netKTime *aktime;
+{
     register afs_int32 code;
     char caller[MAXKTCNAMELEN];
 
@@ -115,7 +117,7 @@ fail:
     return code;
 }
 
-BOZO_Exec(acall, acmd)
+SBOZO_Exec(acall, acmd)
 struct rx_call *acall;
 char *acmd; {
 
@@ -143,7 +145,7 @@ fail:
     return code;
 }
 
-BOZO_GetDates(acall, aname, atime, abakTime, aoldTime)
+SBOZO_GetDates(acall, aname, atime, abakTime, aoldTime)
 struct rx_call *acall;
 char *aname;
 afs_int32 *atime, *abakTime, *aoldTime; {
@@ -178,7 +180,7 @@ afs_int32 *atime, *abakTime, *aoldTime; {
     return 0;
 }
 
-BOZO_UnInstall(acall, aname)
+SBOZO_UnInstall(acall, aname)
 struct rx_call *acall;
 register char *aname; {
     char *filepath;
@@ -267,7 +269,7 @@ static void SaveOldFiles(char *aname)
     renamefile(aname, bbuffer);
 }
 
-BOZO_Install(acall, aname, asize, mode, amtime)
+SBOZO_Install(acall, aname, asize, mode, amtime)
 struct rx_call *acall;
 char *aname;
 afs_int32 asize;
@@ -356,7 +358,7 @@ afs_int32 mode; {
     else return 0;
 }
 
-BOZO_SetCellName(acall, aname)
+SBOZO_SetCellName(acall, aname)
 struct rx_call *acall;
 char *aname; {
     struct afsconf_cell tcell;
@@ -390,7 +392,7 @@ char *aname; {
     return code;
 }
 
-BOZO_GetCellName(acall, aname)
+SBOZO_GetCellName(acall, aname)
 struct rx_call *acall;
 char **aname; {
     register afs_int32 code;
@@ -410,7 +412,7 @@ char **aname; {
     return code;
 }
 
-BOZO_GetCellHost(acall, awhich, aname)
+SBOZO_GetCellHost(acall, awhich, aname)
 struct rx_call *acall;
 afs_uint32 awhich;
 char **aname; {
@@ -445,7 +447,7 @@ done:
     return code;
 }
 
-BOZO_DeleteCellHost(acall, aname)
+SBOZO_DeleteCellHost(acall, aname)
 struct rx_call *acall;
 char *aname; {
     register afs_int32 code;
@@ -488,7 +490,7 @@ char *aname; {
     return code;
 }
 
-BOZO_AddCellHost(acall, aname)
+SBOZO_AddCellHost(acall, aname)
 struct rx_call *acall;
 char *aname; {
     register afs_int32 code;
@@ -561,7 +563,7 @@ char *aname; {
     return code;
 }
 
-BOZO_ListKeys(acall, an, akvno, akey, akeyinfo)
+SBOZO_ListKeys(acall, an, akvno, akey, akeyinfo)
 struct rx_call *acall;
 int an;
 afs_int32 *akvno;
@@ -617,7 +619,7 @@ fail:
     return code;
 }
 
-BOZO_AddKey(acall, an, akey)
+SBOZO_AddKey(acall, an, akey)
 struct rx_call *acall;
 afs_int32 an;
 struct bozo_key *akey; {
@@ -646,7 +648,7 @@ fail:
     return code;
 }
 
-BOZO_SetNoAuthFlag(acall, aflag)
+SBOZO_SetNoAuthFlag(acall, aflag)
 register struct rx_call *acall;
 afs_int32 aflag; {
     register afs_int32 code  = 0;
@@ -665,7 +667,7 @@ fail:
     return code;
 }
 
-BOZO_DeleteKey(acall, an)
+SBOZO_DeleteKey(acall, an)
 struct rx_call *acall;
 afs_int32 an; {
     register afs_int32 code;
@@ -685,7 +687,7 @@ fail:
 }
 
 
-BOZO_ListSUsers(acall, an, aname)
+SBOZO_ListSUsers(acall, an, aname)
 struct rx_call *acall;
 afs_int32 an;
 register char **aname; {
@@ -701,7 +703,7 @@ fail:
     return code;
 }
 
-BOZO_AddSUser(acall, aname)
+SBOZO_AddSUser(acall, aname)
 struct rx_call *acall;
 char *aname; {
     register afs_int32 code;
@@ -721,7 +723,7 @@ fail:
     return code;
 }
 
-BOZO_DeleteSUser(acall, aname)
+SBOZO_DeleteSUser(acall, aname)
 struct rx_call *acall;
 char *aname; {
     register afs_int32 code;
@@ -742,7 +744,7 @@ fail:
     return code;
 }
 
-BOZO_CreateBnode(acall, atype, ainstance, ap1, ap2, ap3, ap4, ap5, notifier)
+SBOZO_CreateBnode(acall, atype, ainstance, ap1, ap2, ap3, ap4, ap5, notifier)
 struct rx_call *acall;
 char *atype;
 char *ainstance;
@@ -777,7 +779,7 @@ char *notifier; {
     return code;
 }
 
-BOZO_WaitAll(acall)
+SBOZO_WaitAll(acall)
 register struct rx_call *acall; {
     register afs_int32 code;
     char caller[MAXKTCNAMELEN];
@@ -796,7 +798,7 @@ fail:
     return code;
 }
 
-BOZO_DeleteBnode(acall, ainstance)
+SBOZO_DeleteBnode(acall, ainstance)
 struct rx_call *acall;
 char *ainstance; {
     register afs_int32 code;
@@ -853,7 +855,7 @@ char *arock; {
 }
 
 /* shutdown and leave down */
-BOZO_ShutdownAll(acall)
+SBOZO_ShutdownAll(acall)
 struct rx_call *acall; {
     /* iterate over all bnodes, setting the status to temporarily disabled */
     register afs_int32 code;
@@ -874,7 +876,7 @@ struct rx_call *acall; {
 }
 
 /* shutdown and restart */
-BOZO_RestartAll(acall)
+SBOZO_RestartAll(acall)
 struct rx_call *acall; {
     register afs_int32 code;
     char caller[MAXKTCNAMELEN];
@@ -901,7 +903,7 @@ struct rx_call *acall; {
     return code;
 }
 
-BOZO_ReBozo(acall)
+SBOZO_ReBozo(acall)
 register struct rx_call *acall; {
     register afs_int32 code;
     char caller[MAXKTCNAMELEN];
@@ -936,7 +938,7 @@ fail:
 }
 
 /* make sure all are running */
-BOZO_StartupAll(acall)
+SBOZO_StartupAll(acall)
 struct rx_call *acall; {
     register afs_int32 code;
     char caller[MAXKTCNAMELEN];
@@ -953,7 +955,7 @@ fail:
     return code;
 }
 
-BOZO_Restart(acall, ainstance)
+SBOZO_Restart(acall, ainstance)
 struct rx_call *acall;
 register char *ainstance; {
     register struct bnode *tb;
@@ -987,7 +989,7 @@ fail:
 }
 
 /* set temp status */
-BOZO_SetTStatus(acall, ainstance, astatus)
+SBOZO_SetTStatus(acall, ainstance, astatus)
 struct rx_call *acall;
 char *ainstance;
 afs_int32 astatus; {
@@ -1015,7 +1017,7 @@ fail:
     return code;
 }
 
-BOZO_SetStatus(acall, ainstance, astatus)
+SBOZO_SetStatus(acall, ainstance, astatus)
 struct rx_call *acall;
 char *ainstance;
 afs_int32 astatus; {
@@ -1044,7 +1046,7 @@ fail:
     return code;
 }
 
-BOZO_GetStatus(acall, ainstance, astat, astatDescr)
+SBOZO_GetStatus(acall, ainstance, astat, astatDescr)
 struct rx_call *acall;
 char *ainstance;
 afs_int32 *astat;
@@ -1106,7 +1108,7 @@ register char *aname; {
     return unlink(tbuffer);
 }
 
-BOZO_Prune(acall, aflags)
+SBOZO_Prune(acall, aflags)
 struct rx_call *acall;
 afs_int32 aflags; {
     register afs_int32 code;
@@ -1162,7 +1164,7 @@ afs_int32 aflags; {
     return code;
 }
 
-BOZO_EnumerateInstance(acall, anum, ainstance)
+SBOZO_EnumerateInstance(acall, anum, ainstance)
 struct rx_call *acall;
 afs_int32 anum;
 char **ainstance; {
@@ -1284,7 +1286,7 @@ int GetRequiredDirPerm (path)
     return -1;
 }
 
-BOZO_GetInstanceInfo(acall, ainstance, atype, astatus)
+SBOZO_GetInstanceInfo(acall, ainstance, atype, astatus)
   IN struct rx_call *acall;
   IN char *ainstance;
   OUT char **atype;
@@ -1318,7 +1320,7 @@ BOZO_GetInstanceInfo(acall, ainstance, atype, astatus)
     return 0;
 }
 
-BOZO_GetInstanceParm(acall, ainstance, anum, aparm)
+SBOZO_GetInstanceParm(acall, ainstance, anum, aparm)
 struct rx_call *acall;
 char *ainstance;
 afs_int32 anum;
@@ -1347,7 +1349,7 @@ char **aparm; {
     return code;
 }
 
-BOZO_GetLog(acall, aname)
+SBOZO_GetLog(acall, aname)
 register struct rx_call *acall;
 char *aname; {
     register afs_int32 code;
@@ -1409,7 +1411,7 @@ char *aname; {
     return code;
 }
 
-BOZO_GetInstanceStrings(acall, abnodeName, as1, as2, as3, as4)
+SBOZO_GetInstanceStrings(acall, abnodeName, as1, as2, as3, as4)
 struct rx_call *acall;
 char *abnodeName;
 char **as1, **as2, **as3, **as4; {
@@ -1442,7 +1444,7 @@ char **as1, **as2, **as3, **as4; {
 }
 
 #ifdef BOS_RESTRICTED_MODE
-BOZO_GetRestrictedMode(acall, arestmode) 
+SBOZO_GetRestrictedMode(acall, arestmode) 
 struct rx_call *acall;
 afs_int32 *arestmode; 
 {
@@ -1450,7 +1452,7 @@ afs_int32 *arestmode;
      return 0;
 }
 
-BOZO_SetRestrictedMode(acall, arestmode) 
+SBOZO_SetRestrictedMode(acall, arestmode) 
 struct rx_call *acall;
 afs_int32 arestmode; 
 {
@@ -1472,14 +1474,14 @@ afs_int32 arestmode;
      return code;
 }
 #else
-BOZO_GetRestrictedMode(acall, arestmode) 
+SBOZO_GetRestrictedMode(acall, arestmode) 
 struct rx_call *acall;
 afs_int32 *arestmode; 
 {
      return RXGEN_OPCODE;
 }
 
-BOZO_SetRestrictedMode(acall, arestmode) 
+SBOZO_SetRestrictedMode(acall, arestmode) 
 struct rx_call *acall;
 afs_int32 arestmode; 
 {

diff --git a/src/bozo/bosserver.c b/src/bozo/bosserver.c
index 28bffe4..84d5178 100644 (file)
--- a/src/bozo/bosserver.c
+++ b/src/bozo/bosserver.c
@@ -488,7 +488,7 @@ static BozoDaemon() {
 
        /* see if we should do a restart */
        if (now > nextRestart) {
-           BOZO_ReBozo(0);     /* doesn't come back */
+           SBOZO_ReBozo(0);    /* doesn't come back */
        }
        
        /* see if we should restart a server */

diff --git a/src/budb/budb.rg b/src/budb/budb.rg
index 6653eeb..aa62a9c 100644 (file)
--- a/src/budb/budb.rg
+++ b/src/budb/budb.rg
@@ -162,6 +162,7 @@ struct budb_volumeEntry { /* describes a fragment of a volume */
 /* procedure interface */
 
 package BUDB_
+prefix S
 statindex 17
 
 /* All these procedures take a connection parameter since they may contact the
@@ -388,7 +389,7 @@ UseTape
 /* text file management calls - alphabetic */
 
 GetText
- (  IN  afs_int32 lockHandle,
+ (  IN  afs_uint32 lockHandle,
     IN  afs_int32 textType,                    /* which type of text */
     IN  afs_int32 maxLength,
     IN         afs_int32 offset,
@@ -397,10 +398,10 @@ GetText
 
 GetTextVersion
  (  IN afs_int32 textType,
-   OUT afs_int32 *tversion);
+   OUT afs_uint32 *tversion);
 
 SaveText
- (  IN  afs_int32 lockHandle,          /* which type of text */
+ (  IN  afs_uint32 lockHandle,         /* which type of text */
     IN  afs_int32 textType,                    /* which type of text */
     IN afs_int32 offset,                       /* offset into text block */
     IN  afs_int32 flags,

diff --git a/src/budb/db_lock.c b/src/budb/db_lock.c
index f939ebb..9dbdc45 100644 (file)
--- a/src/budb/db_lock.c
+++ b/src/budb/db_lock.c
@@ -32,7 +32,7 @@ RCSID("$Header$");
 
 afs_int32 FreeAllLocks(), FreeLock(), GetInstanceId(), GetLock();
 
-afs_int32 BUDB_FreeAllLocks (call, instanceId)
+afs_int32 SBUDB_FreeAllLocks (call, instanceId)
      struct rx_call *call;
      afs_uint32 instanceId;
 {
@@ -80,7 +80,7 @@ afs_int32 FreeAllLocks (call, instanceId)
     return(code);
 }
 
-afs_int32 BUDB_FreeLock (call, lockHandle)
+afs_int32 SBUDB_FreeLock (call, lockHandle)
      struct rx_call *call;
      afs_uint32 lockHandle;
 {
@@ -125,7 +125,7 @@ abort_exit:
     return(code);
 }
 
-afs_int32 BUDB_GetInstanceId(call, instanceId)
+afs_int32 SBUDB_GetInstanceId(call, instanceId)
      struct rx_call *call;
      afs_uint32 *instanceId;
 {
@@ -164,7 +164,7 @@ afs_int32 GetInstanceId (call, instanceId)
 }
 
 
-afs_int32 BUDB_GetLock (call, instanceId, lockName, expiration, lockHandle)
+afs_int32 SBUDB_GetLock (call, instanceId, lockName, expiration, lockHandle)
      struct rx_call *call;
      afs_uint32 instanceId;
      afs_int32 lockName;

diff --git a/src/budb/db_text.c b/src/budb/db_text.c
index 34b831b..d362485 100644 (file)
--- a/src/budb/db_text.c
+++ b/src/budb/db_text.c
@@ -44,7 +44,7 @@ RCSID("$Header$");
 
 afs_int32 GetText(), GetTextVersion(), SaveText();
 
-afs_int32 BUDB_GetText (call, lockHandle, textType, maxLength, offset, 
+afs_int32 SBUDB_GetText (call, lockHandle, textType, maxLength, offset, 
                  nextOffset, charListPtr)
      struct rx_call *call;
      afs_uint32 lockHandle;
@@ -237,7 +237,7 @@ abort_exit:
  *     get the version number for the specified text block
  */
 
-afs_int32 BUDB_GetTextVersion (call, textType,  tversion)
+afs_int32 SBUDB_GetTextVersion (call, textType,  tversion)
      struct rx_call *call;
      afs_int32 textType;
      afs_uint32 *tversion;
@@ -282,7 +282,7 @@ afs_int32 GetTextVersion (call, textType,  tversion)
  *     charListPtr storage automatically malloced and freed
  */
 
-afs_int32 BUDB_SaveText (call, lockHandle, textType, offset, flags, charListPtr)
+afs_int32 SBUDB_SaveText (call, lockHandle, textType, offset, flags, charListPtr)
      struct rx_call *call;
      afs_uint32 lockHandle;
      afs_int32 textType;

diff --git a/src/budb/dbs_dump.c b/src/budb/dbs_dump.c
index 462360a..78b16a0 100644 (file)
--- a/src/budb/dbs_dump.c
+++ b/src/budb/dbs_dump.c
@@ -90,7 +90,7 @@ error_exit:
 
 
 afs_int32 DumpDB(), RestoreDbHeader();
-afs_int32 BUDB_DumpDB (call, firstcall, maxLength, charListPtr, done)
+afs_int32 SBUDB_DumpDB (call, firstcall, maxLength, charListPtr, done)
      struct rx_call *call;
      int  firstcall;
      afs_int32 maxLength;
@@ -227,7 +227,7 @@ error_exit:
     return(code);
 }
 
-afs_int32 BUDB_RestoreDbHeader (call, header)
+afs_int32 SBUDB_RestoreDbHeader (call, header)
      struct rx_call *call;
      struct DbHeader *header;
 {

diff --git a/src/budb/ol_verify.c b/src/budb/ol_verify.c
index b17f9b5..ac0af72 100644 (file)
--- a/src/budb/ol_verify.c
+++ b/src/budb/ol_verify.c
@@ -1415,7 +1415,7 @@ error_exit:
  *     host - address of host that did verification
  */
 afs_int32 DbVerify();
-afs_int32 BUDB_DbVerify(call, status, orphans, host)
+afs_int32 SBUDB_DbVerify(call, status, orphans, host)
      struct rx_call *call;
      afs_int32 *status;
      afs_int32 *orphans;

diff --git a/src/budb/procs.c b/src/budb/procs.c
index aa8f4fd..6aa8462 100644 (file)
--- a/src/budb/procs.c
+++ b/src/budb/procs.c
@@ -1029,7 +1029,7 @@ rememberDump(dumpAddrParam, dumpParam,  dumpListPtrParam)
  * ---------------------------------------------
  */
 
-afs_int32 BUDB_AddVolume (call, vol)
+afs_int32 SBUDB_AddVolume (call, vol)
   struct rx_call *call;
   struct budb_volumeEntry *vol;
 {
@@ -1144,7 +1144,7 @@ afs_int32 AddVolume (call, vol)
 }
 
 
-afs_int32 BUDB_AddVolumes (call, vols)
+afs_int32 SBUDB_AddVolumes (call, vols)
   struct rx_call *call;
   struct budb_volumeList *vols;
 {
@@ -1284,7 +1284,7 @@ afs_int32 AddVolumes (call, vols)
  *     1) record the volume set
  */
 
-afs_int32 BUDB_CreateDump(call, dump)
+afs_int32 SBUDB_CreateDump(call, dump)
      struct rx_call *call;
      struct budb_dumpEntry *dump;
 {
@@ -1432,7 +1432,7 @@ afs_int32 CreateDump(call, dump)
     return code;
 }
 
-afs_int32 BUDB_DeleteDump (call, id, fromTime, toTime, dumps)
+afs_int32 SBUDB_DeleteDump (call, id, fromTime, toTime, dumps)
      struct rx_call *call;
      dumpId id;
      Date   fromTime;
@@ -1464,7 +1464,7 @@ afs_int32 DoDeleteDump (call, id, fromTime, toTime, dumps)
     return(code);
 }
 
-afs_int32 BUDB_ListDumps (call, sflags, name, groupid, fromTime, toTime, dumps, flags)
+afs_int32 SBUDB_ListDumps (call, sflags, name, groupid, fromTime, toTime, dumps, flags)
    struct rx_call *call;
    afs_int32 sflags, groupid;
    char *name;
@@ -1583,7 +1583,7 @@ afs_int32 ListDumps (call, sflags, groupid, fromTime, toTime, dumps, flags)
     return(code);
 }
 
-afs_int32 BUDB_DeleteTape (call, tape)
+afs_int32 SBUDB_DeleteTape (call, tape)
   struct rx_call *call;
   struct budb_tapeEntry *tape;         /* tape info */
 {
@@ -1643,7 +1643,7 @@ afs_int32 DoDeleteTape (call, tape)
  *      n - some error. May or may not have deleted information.
  */
 
-afs_int32 BUDB_DeleteVDP (call, dsname, dumpPath, curDumpId)
+afs_int32 SBUDB_DeleteVDP (call, dsname, dumpPath, curDumpId)
      struct rx_call *call;
      char *dsname;
      char *dumpPath;
@@ -1729,7 +1729,7 @@ afs_int32 DeleteVDP (call, dsname, dumpPath, curDumpId)
  *      volume is not found in the dump, then look for it in its parent dump.
  */
 
-afs_int32 BUDB_FindClone(call, dumpID, volName, clonetime)
+afs_int32 SBUDB_FindClone(call, dumpID, volName, clonetime)
      struct rx_call *call;
      afs_int32 dumpID;
      char *volName;
@@ -1909,7 +1909,7 @@ afs_int32 FindClone (call, dumpID, volName, clonetime)
  *      deptr - descriptor of most recent dump
  */
 
-afs_int32 BUDB_FindDump (call, volumeName, beforeDate, deptr)
+afs_int32 SBUDB_FindDump (call, volumeName, beforeDate, deptr)
      struct rx_call *call;
      char *volumeName;
      afs_int32 beforeDate;
@@ -2005,7 +2005,7 @@ afs_int32 FindDump (call, volumeName, beforeDate, deptr)
  *     dname - dumpname
  */
 
-afs_int32 BUDB_FindLatestDump (call, vsname, dumpPath, dumpentry)
+afs_int32 SBUDB_FindLatestDump (call, vsname, dumpPath, dumpentry)
      struct rx_call *call;
      char      *vsname, *dumpPath;
      struct    budb_dumpEntry *dumpentry;
@@ -2137,7 +2137,7 @@ afs_int32 FindLatestDump (call, vsname, dumpPath, dumpentry)
 }
 
 
-afs_int32 BUDB_FinishDump (call, dump)
+afs_int32 SBUDB_FinishDump (call, dump)
   struct rx_call *call;
   struct budb_dumpEntry *dump;
 {
@@ -2191,7 +2191,7 @@ afs_int32 FinishDump (call, dump)
     return code;
 }
 
-afs_int32 BUDB_FinishTape (call, tape)
+afs_int32 SBUDB_FinishTape (call, tape)
   struct rx_call *call;
   struct budb_tapeEntry *tape;
 {
@@ -2287,7 +2287,7 @@ afs_int32 FinishTape (call, tape)
  *     BUDB_OP_DUMPID
  */
 
-afs_int32 BUDB_GetDumps (call, majorVersion, flags, name, start, end,
+afs_int32 SBUDB_GetDumps (call, majorVersion, flags, name, start, end,
                    index, nextIndexP, dbTimeP, dumps)
   struct rx_call *call;
   int majorVersion;                    /* version of interface structures */
@@ -2607,7 +2607,7 @@ afs_int32 makeAppended (ut, appendedDumpID, initialDumpID, startTapeSeq)
     return(code);
 }
 
-afs_int32 BUDB_MakeDumpAppended (call, appendedDumpID, initialDumpID, startTapeSeq)
+afs_int32 SBUDB_MakeDumpAppended (call, appendedDumpID, initialDumpID, startTapeSeq)
      struct rx_call *call;
      afs_int32           appendedDumpID;
      afs_int32           initialDumpID;
@@ -2647,7 +2647,7 @@ afs_int32 MakeDumpAppended (call, appendedDumpID, initialDumpID, startTapeSeq)
 }
 
 /* Find the last tape of a dump-set. This includes any appended dumps */
-afs_int32 BUDB_FindLastTape (call, dumpID, dumpEntry, tapeEntry, volEntry)
+afs_int32 SBUDB_FindLastTape (call, dumpID, dumpEntry, tapeEntry, volEntry)
      struct rx_call          *call;
      afs_int32                    dumpID;
      struct budb_dumpEntry   *dumpEntry;
@@ -2772,7 +2772,7 @@ afs_int32 FindLastTape (call, dumpID, dumpEntry, tapeEntry, volEntry)
 }
 
 
-afs_int32 BUDB_GetTapes (call, majorVersion, flags, name, start, end, index, nextIndexP,
+afs_int32 SBUDB_GetTapes (call, majorVersion, flags, name, start, end, index, nextIndexP,
               dbTimeP, tapes)
      struct rx_call *call;
      int   majorVersion;               /* version of interface structures */
@@ -2926,7 +2926,7 @@ afs_int32 GetTapes (call, majorVersion, flags, name, start, end,
  *             name on the selected dumpid.
  */
 
-afs_int32 BUDB_GetVolumes (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 */
@@ -3105,7 +3105,7 @@ afs_int32 GetVolumes (call, majorVersion, flags, name, start, end,
     return code;
 }
 
-afs_int32 BUDB_UseTape (call, tape, new)
+afs_int32 SBUDB_UseTape (call, tape, new)
   struct rx_call *call;
   struct budb_tapeEntry *tape;         /* tape info */
   int  *new;                           /* set if tape is new */
@@ -3198,7 +3198,7 @@ afs_int32 UseTape (call, tape, new)
  * ---------------------------------------------
  */
 
-afs_int32 BUDB_T_DumpHashTable (call, type, filename)
+afs_int32 SBUDB_T_DumpHashTable (call, type, filename)
   struct rx_call *call;
   int   type;
   char *filename;
@@ -3296,7 +3296,7 @@ afs_int32 T_DumpHashTable (call, type, filename)
     return code;
 }
 
-afs_int32 BUDB_T_GetVersion (call, majorVersion)
+afs_int32 SBUDB_T_GetVersion (call, majorVersion)
   struct rx_call *call;
   int *majorVersion;
 {
@@ -3327,7 +3327,7 @@ afs_int32 T_GetVersion (call, majorVersion)
  *     dump as much of the database as possible int /tmp/<filename>
  */
 
-afs_int32 BUDB_T_DumpDatabase (call, filename)
+afs_int32 SBUDB_T_DumpDatabase (call, filename)
      struct rx_call *call;
      char *filename;
 {

diff --git a/src/butc/tcprocs.c b/src/butc/tcprocs.c
index 827a827..7679985 100644 (file)
--- a/src/butc/tcprocs.c
+++ b/src/butc/tcprocs.c
@@ -568,7 +568,8 @@ STC_TCInfo(acid, tciptr)
  */
 STC_DeleteDump(acid, dumpID, taskId)
    struct rx_call *acid;
-   afs_int32 *taskId;
+   afs_uint32 dumpID;
+   afs_uint32 *taskId;
 {
    struct deleteDumpIf *ptr=0;
    statusP statusPtr=0;

diff --git a/src/fsint/afsint.xg b/src/fsint/afsint.xg
index 3140244..64a7444 100644 (file)
--- a/src/fsint/afsint.xg
+++ b/src/fsint/afsint.xg
@@ -685,9 +685,9 @@ FetchData64(
 StoreData64(
   IN  AFSFid *Fid, 
   AFSStoreStatus *InStatus, 
-  afs_int64 Pos, 
-  afs_int64 Length, 
-  afs_int64 FileLength, 
+  afs_uint64 Pos, 
+  afs_uint64 Length, 
+  afs_uint64 FileLength, 
   OUT AFSFetchStatus *OutStatus, 
   AFSVolSync *Sync
 ) split = 65538;

diff --git a/src/fsprobe/fsprobe_callback.c b/src/fsprobe/fsprobe_callback.c
index 2620af2..ef95eac 100644 (file)
--- a/src/fsprobe/fsprobe_callback.c
+++ b/src/fsprobe/fsprobe_callback.c
@@ -230,8 +230,10 @@ afs_int32 SRXAFSCB_Probe(rxcall)
  *     As advertised.
  *------------------------------------------------------------------------*/
 
-afs_int32 SRXAFSCB_GetCE64(rxcall)
+afs_int32 SRXAFSCB_GetCE64(rxcall, index, ce)
     struct rx_call *rxcall;
+    afs_int32 index;
+    AFSDBCacheEntry64 *ce;
 
 { /*SRXAFSCB_GetCE64*/
 
@@ -253,8 +255,10 @@ afs_int32 SRXAFSCB_GetCE64(rxcall)
 
 } /*SRXAFSCB_GetCE64*/
 
-afs_int32 SRXAFSCB_GetCE(rxcall)
+afs_int32 SRXAFSCB_GetCE(rxcall, index, ce)
     struct rx_call *rxcall;
+    afs_int32 index;
+    AFSDBCacheEntry *ce;
 
 { /*SRXAFSCB_GetCE*/
 
@@ -298,8 +302,10 @@ afs_int32 SRXAFSCB_GetCE(rxcall)
  *     As advertised.
  *------------------------------------------------------------------------*/
 
-afs_int32 SRXAFSCB_GetLock(rxcall)
+afs_int32 SRXAFSCB_GetLock(rxcall, index, lock)
     struct rx_call *rxcall;
+    afs_int32 index;
+    AFSDBLock *lock;
 
 { /*SRXAFSCB_GetLock*/
 
@@ -343,8 +349,9 @@ afs_int32 SRXAFSCB_GetLock(rxcall)
  *     As advertised.
  *------------------------------------------------------------------------*/
 
-afs_int32 SRXAFSCB_XStatsVersion(rxcall)
+afs_int32 SRXAFSCB_XStatsVersion(rxcall, versionNumberP)
     struct rx_call *rxcall;
+    afs_int32 *versionNumberP;
 
 { /*SRXAFSCB_XStatsVersion*/
 
@@ -388,8 +395,13 @@ afs_int32 SRXAFSCB_XStatsVersion(rxcall)
  *     As advertised.
  *------------------------------------------------------------------------*/
 
-afs_int32 SRXAFSCB_GetXStats(rxcall)
+afs_int32 SRXAFSCB_GetXStats(rxcall, clientVN, collN, srvVNP, timeP, dataP)
     struct rx_call *rxcall;
+    afs_int32 clientVN;
+    afs_int32 collN;
+    afs_int32 *srvVNP;
+    afs_int32 *timeP;
+    AFSCB_CollData *dataP;
 
 { /*SRXAFSCB_GetXStats*/
 

diff --git a/src/kauth/authclient.c b/src/kauth/authclient.c
index 7851710..8e86f11 100644 (file)
--- a/src/kauth/authclient.c
+++ b/src/kauth/authclient.c
@@ -550,7 +550,6 @@ afs_int32 ka_Authenticate (
     code = kawrap_ubik_Call (KAA_AuthenticateV2, conn, 0,
                     name, instance, start, end, &arequest, &oanswer);
     if (code == RXGEN_OPCODE) {
-       extern afs_int32 KAA_Authenticate();
        oanswer.MaxSeqLen = sizeof(answer);
        oanswer.SeqBody = (char *)&answer;
        version = 1;

diff --git a/src/kauth/kautils.p.h b/src/kauth/kautils.p.h
index ca89d2a..d0a15a7 100644 (file)
--- a/src/kauth/kautils.p.h
+++ b/src/kauth/kautils.p.h
@@ -330,26 +330,10 @@ extern afs_int32 ka_VerifyUserPassword(
     ka_UserAuthenticateGeneral \
         (KA_USERAUTH_VERSION + (f), n,i,r,p,l, /*spare1,2*/0,0, rP)
 
-extern afs_int32 KAM_CreateUser();
-extern afs_int32 KAM_DeleteUser();
-extern afs_int32 KAA_ChangePassword();
-extern afs_int32 KAM_SetPassword();
-extern afs_int32 KAA_Authenticate(), KAA_AuthenticateV2();
-extern afs_int32 KAT_GetTicket();
-extern afs_int32 KAM_SetFields();
 #define KA_REUSEPW 1
 #define KA_NOREUSEPW 2
 #define KA_ISLOCKED 4                
 
-extern afs_int32 KAM_GetEntry();
-extern afs_int32 KAM_ListEntry();
-extern afs_int32 KAM_GetStats();
-extern afs_int32 KAM_GetPassword();
-extern afs_int32 KAM_GetRandomKey();
-extern afs_int32 KAM_Debug();
-extern afs_int32 KAM_Unlock();
-extern afs_int32 KAM_LockStatus();
-
 #define KA_AUTHENTICATION_SERVICE 731
 #define KA_TICKET_GRANTING_SERVICE 732
 #define KA_MAINTENANCE_SERVICE 733

diff --git a/src/xstat/xstat_fs_callback.c b/src/xstat/xstat_fs_callback.c
index 104b119..b1d8f5e 100644 (file)
--- a/src/xstat/xstat_fs_callback.c
+++ b/src/xstat/xstat_fs_callback.c
@@ -237,8 +237,10 @@ afs_int32 SRXAFSCB_Probe(rxcall)
  *     As advertised.
  *------------------------------------------------------------------------*/
 
-afs_int32 SRXAFSCB_GetCE64(rxcall)
+afs_int32 SRXAFSCB_GetCE64(rxcall, index, ce)
     struct rx_call *rxcall;
+    afs_int32 index;
+    AFSDBCacheEntry64 *ce;
 
 { /*SRXAFSCB_GetCE64*/
 
@@ -260,8 +262,10 @@ afs_int32 SRXAFSCB_GetCE64(rxcall)
 
 } /*SRXAFSCB_GetCE64*/
 
-afs_int32 SRXAFSCB_GetCE(rxcall)
+afs_int32 SRXAFSCB_GetCE(rxcall, index, ce)
     struct rx_call *rxcall;
+    afs_int32 index;
+    AFSDBCacheEntry *ce;
 
 { /*SRXAFSCB_GetCE*/
 
@@ -305,8 +309,10 @@ afs_int32 SRXAFSCB_GetCE(rxcall)
  *     As advertised.
  *------------------------------------------------------------------------*/
 
-afs_int32 SRXAFSCB_GetLock(rxcall)
+afs_int32 SRXAFSCB_GetLock(rxcall, index, lock)
     struct rx_call *rxcall;
+    afs_int32 index;
+    AFSDBLock *lock;
 
 { /*SRXAFSCB_GetLock*/
 
@@ -350,8 +356,9 @@ afs_int32 SRXAFSCB_GetLock(rxcall)
  *     As advertised.
  *------------------------------------------------------------------------*/
 
-afs_int32 SRXAFSCB_XStatsVersion(rxcall)
+afs_int32 SRXAFSCB_XStatsVersion(rxcall, versionNumberP)
     struct rx_call *rxcall;
+    afs_int32 *versionNumberP;
 
 { /*SRXAFSCB_XStatsVersion*/
 
@@ -395,8 +402,14 @@ afs_int32 SRXAFSCB_XStatsVersion(rxcall)
  *     As advertised.
  *------------------------------------------------------------------------*/
 
-afs_int32 SRXAFSCB_GetXStats(rxcall)
+afs_int32 SRXAFSCB_GetXStats(rxcall, clientVersionNumber, collectionNumber,
+                            srvVersionNumberP, timeP, dataP)
     struct rx_call *rxcall;
+    afs_int32 clientVersionNumber;
+    afs_int32 collectionNumber;
+    afs_int32 *srvVersionNumberP;
+    afs_int32 *timeP;
+    AFSCB_CollData *dataP;
 
 { /*SRXAFSCB_GetXStats*/