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

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

(cherry picked from commit 1e6bc5de521a319a8a247738f41065a1e11fec2b)

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 fd9ef0fe346f414d3abd11545ab2522355cb8985..6157643a5124f802cb189009d7551a535dda73e0 100644 (file)
--- a/src/fsprobe/fsprobe_callback.c
+++ b/src/fsprobe/fsprobe_callback.c
@@ -641,7 +641,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 a66e30b2e74f94343b0ae708b02fa03114364db7..e5e2356ce45de8e7b196bd11df069775be053de2 100644 (file)
--- a/src/xstat/xstat_fs_callback.c
+++ b/src/xstat/xstat_fs_callback.c
@@ -646,7 +646,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;
 }