Fix minor build errors, and rename the dumpId argument of butc's

DeleteDump to avoid collision with budb's #define dumpId.

diff --git a/src/bubasics/butc.xg b/src/bubasics/butc.xg
index f7982026d73aa908c3dd7ff950fdc50e1f47a2a7..d5c54ec2dcdf4e17fcb1c771568ef05cb9a9b9f4 100644 (file)
--- a/src/bubasics/butc.xg
+++ b/src/bubasics/butc.xg
@@ -253,7 +253,7 @@ proc ScanStatus
  );
 
 proc DeleteDump
- ( IN afs_uint32  dumpId,
+ ( IN afs_uint32  aDumpId,
    OUT afs_uint32 *taskId
  );
 

diff --git a/src/fsprobe/fsprobe_callback.c b/src/fsprobe/fsprobe_callback.c
index 8303158e35007720b9f40d38395814d3ea4f1f61..2620af23565559dcadb2866dca3f3f4003ee21f6 100644 (file)
--- a/src/fsprobe/fsprobe_callback.c
+++ b/src/fsprobe/fsprobe_callback.c
@@ -664,7 +664,7 @@ int SRXAFSCB_GetCellServDB(
     struct rx_call *a_call,
     afs_int32 a_index,
     char **a_name,
-    afs_int32 *a_hosts)
+    serverList *a_hosts)
 {
     return RXGEN_OPCODE;
 }

diff --git a/src/libadmin/bos/afs_bosAdmin.c b/src/libadmin/bos/afs_bosAdmin.c
index 6d59550f785a9ba919fb918afeb95ef974ba5b4e..d569dcd8242bd72e007fb1d347f8d5a7d8be6d8c 100644 (file)
--- a/src/libadmin/bos/afs_bosAdmin.c
+++ b/src/libadmin/bos/afs_bosAdmin.c
@@ -64,8 +64,8 @@ extern int BOZO_RestartAll();
 extern int BOZO_SetCellName();
 extern int BOZO_SetNoAuthFlag();
 extern int BOZO_SetRestartTime();
-extern int BOZO_SetStatus(struct rx_connection *, const char *, long);
-extern int BOZO_SetTStatus(struct rx_connection *, const char *, long);
+extern int BOZO_SetStatus(struct rx_connection *, char *, afs_int32);
+extern int BOZO_SetTStatus(struct rx_connection *, char *, afs_int32);
 extern int BOZO_ShutdownAll();
 extern int BOZO_StartupAll();
 extern int BOZO_UnInstall();

diff --git a/src/xstat/xstat_fs_callback.c b/src/xstat/xstat_fs_callback.c
index 634691bb963cf9c2f9fbafbe790176b16dd38677..104b119fe4eeebd4a4dab9085bc8383605398027 100644 (file)
--- a/src/xstat/xstat_fs_callback.c
+++ b/src/xstat/xstat_fs_callback.c
@@ -669,7 +669,7 @@ int SRXAFSCB_GetCellServDB(
     struct rx_call *a_call,
     afs_int32 a_index,
     char **a_name,
-    afs_int32 *a_hosts)
+    serverList *a_hosts)
 {
     return RXGEN_OPCODE;
 }