DEVEL15-libadmin-prototypes-20090316

LICENSE IPL10
FIXES 124246

prototype the libadmin directory

(cherry picked from commit cff2da10d6f2c4b568c07a331ceb96cbf952576a)

diff --git a/src/libadmin/adminutil/afs_utilAdmin.c b/src/libadmin/adminutil/afs_utilAdmin.c
index 8072dcb55136594aeb8abb32876aac7e225decda..86a1465e0f78e58c43ed0023ca4fc07e5af6da23 100644 (file)
--- a/src/libadmin/adminutil/afs_utilAdmin.c
+++ b/src/libadmin/adminutil/afs_utilAdmin.c
@@ -19,7 +19,6 @@ RCSID
 #include <string.h>
 #include <afs/afs_Admin.h>
 #include "afs_AdminInternal.h"
-#include "afs_utilAdmin.h"
 #include <afs/pthread_glock.h>
 #include <afs/cellconfig.h>
 #include <afs/dirpath.h>
@@ -42,6 +41,7 @@ RCSID
 #include <arpa/inet.h>
 #include <netdb.h>
 #endif
+#include "afs_utilAdmin.h"
 
 /*
  * AIX 4.2 has PTHREAD_CREATE_UNDETACHED and not PTHREAD_CREATE_JOINABLE
@@ -1321,7 +1321,11 @@ DestroyRPCStats(void *rpc_specific, afs_status_p st)
  */
 
 int ADMINAPI
-util_RPCStatsGetBegin(struct rx_connection *conn, int (*rpc) (),
+util_RPCStatsGetBegin(struct rx_connection *conn, 
+                     int (*rpc) (struct rx_connection *,
+                                 afs_uint32, afs_uint32 *,
+                                 afs_uint32 *, afs_uint32 *,
+                                 afs_uint32 *, struct rpcStats *),
                      void **iterationIdP, afs_status_p st)
 {
     int rc = 0;
@@ -1515,7 +1519,9 @@ util_RPCStatsGetDone(const void *iterationId, afs_status_p st)
  */
 
 int ADMINAPI
-util_RPCStatsStateGet(struct rx_connection *conn, int (*rpc) (),
+util_RPCStatsStateGet(struct rx_connection *conn, 
+                     int (*rpc) (struct rx_connection *,
+                                 afs_RPCStatsState_p),
                      afs_RPCStatsState_p state, afs_status_p st)
 {
     int rc = 0;
@@ -1571,7 +1577,8 @@ util_RPCStatsStateGet(struct rx_connection *conn, int (*rpc) (),
  */
 
 int ADMINAPI
-util_RPCStatsStateEnable(struct rx_connection *conn, int (*rpc) (),
+util_RPCStatsStateEnable(struct rx_connection *conn, 
+                        int (*rpc) (struct rx_connection *),
                         afs_status_p st)
 {
     int rc = 0;
@@ -1622,7 +1629,8 @@ util_RPCStatsStateEnable(struct rx_connection *conn, int (*rpc) (),
  */
 
 int ADMINAPI
-util_RPCStatsStateDisable(struct rx_connection *conn, int (*rpc) (),
+util_RPCStatsStateDisable(struct rx_connection *conn, 
+                         int (*rpc) (struct rx_connection *),
                          afs_status_p st)
 {
     int rc = 0;
@@ -1676,7 +1684,9 @@ util_RPCStatsStateDisable(struct rx_connection *conn, int (*rpc) (),
  */
 
 int ADMINAPI
-util_RPCStatsClear(struct rx_connection *conn, int (*rpc) (),
+util_RPCStatsClear(struct rx_connection *conn, 
+                  int (*rpc) (struct rx_connection *,
+                              afs_RPCStatsClearFlag_t),
                   afs_RPCStatsClearFlag_t flag, afs_status_p st)
 {
     int rc = 0;

diff --git a/src/libadmin/adminutil/afs_utilAdmin.h b/src/libadmin/adminutil/afs_utilAdmin.h
index d51b3bcf27c481d44b71a1b20981d215b340e0a7..c07ea7ce5022c58dc8d0b2c1895dfa6cb325e4a7 100644 (file)
--- a/src/libadmin/adminutil/afs_utilAdmin.h
+++ b/src/libadmin/adminutil/afs_utilAdmin.h
@@ -48,7 +48,12 @@ extern int ADMINAPI CellHandleIsValid(const void *cellHandle,
                                      afs_status_p st);
 
 extern int ADMINAPI util_RPCStatsGetBegin(struct rx_connection *conn,
-                                         int (*rpc) (), void **iterationIdP,
+                                         int (*rpc) (struct rx_connection *,
+                                                     afs_uint32, afs_uint32 *,
+                                                     afs_uint32 *, afs_uint32 *,
+                                                     afs_uint32 *, 
+                                                     struct rpcStats *), 
+                                         void **iterationIdP,
                                          afs_status_p st);
 
 extern int ADMINAPI util_RPCStatsGetNext(const void *iterationId,
@@ -59,18 +64,22 @@ extern int ADMINAPI util_RPCStatsGetDone(const void *iterationId,
                                         afs_status_p st);
 
 extern int ADMINAPI util_RPCStatsStateGet(struct rx_connection *conn,
-                                         int (*rpc) (),
+                                         int (*rpc) (struct rx_connection *,
+                                                     afs_RPCStatsState_p),
                                          afs_RPCStatsState_p state,
                                          afs_status_p st);
 
 extern int ADMINAPI util_RPCStatsStateEnable(struct rx_connection *conn,
-                                            int (*rpc) (), afs_status_p st);
+                                            int (*rpc) (struct rx_connection *), 
+                                            afs_status_p st);
 
 extern int ADMINAPI util_RPCStatsStateDisable(struct rx_connection *conn,
-                                             int (*rpc) (), afs_status_p st);
+                                             int (*rpc) (struct rx_connection *), 
+                                             afs_status_p st);
 
 extern int ADMINAPI util_RPCStatsClear(struct rx_connection *conn,
-                                      int (*rpc) (),
+                                      int (*rpc) (struct rx_connection *, 
+                                                  afs_RPCStatsClearFlag_t),
                                       afs_RPCStatsClearFlag_t flag,
                                       afs_status_p st);
 

diff --git a/src/libadmin/bos/afs_bosAdmin.c b/src/libadmin/bos/afs_bosAdmin.c
index 6ad03a7a48404898d0a49979800e1b2fb8f64b2d..13f57219a8fea901f583e213ed02b6b19aa1fe1b 100644 (file)
--- a/src/libadmin/bos/afs_bosAdmin.c
+++ b/src/libadmin/bos/afs_bosAdmin.c
@@ -15,6 +15,8 @@ RCSID
 
 #include <stdio.h>
 #include <afs/stds.h>
+#include <rx/rx.h>
+#include <rx/rxstat.h>
 #include "afs_bosAdmin.h"
 #include "../adminutil/afs_AdminInternal.h"
 #include <afs/afs_AdminErrors.h>

diff --git a/src/libadmin/cfg/cfgclient.c b/src/libadmin/cfg/cfgclient.c
index 9ac669f7b5831b80cea5e12cfbf9edbece0608fa..500c37346375f962dd8e41460bbe0c24ee9e3f22 100644 (file)
--- a/src/libadmin/cfg/cfgclient.c
+++ b/src/libadmin/cfg/cfgclient.c
@@ -26,6 +26,8 @@ RCSID
 #include <string.h>
 #include <pthread.h>
 
+#include <rx/rx.h>
+#include <rx/rxstat.h>
 #include <afs/afs_Admin.h>
 #include <afs/afs_AdminErrors.h>
 #include <afs/afs_utilAdmin.h>

diff --git a/src/libadmin/cfg/cfgdb.c b/src/libadmin/cfg/cfgdb.c
index 52ba126cd9c9326b53e1c0091245b2e40fc4d46f..8f29c00247c00e0f108c12e083da9f2e10e624c1 100644 (file)
--- a/src/libadmin/cfg/cfgdb.c
+++ b/src/libadmin/cfg/cfgdb.c
@@ -27,6 +27,9 @@ RCSID
 
 #include <pthread.h>
 
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_AdminErrors.h>
 #include <afs/afs_bosAdmin.h>

diff --git a/src/libadmin/cfg/cfghost.c b/src/libadmin/cfg/cfghost.c
index dee571235988934198eb39b7228d69eb119e47cd..4ccd59f8c203737cb6dad05b5b638549e7704a7a 100644 (file)
--- a/src/libadmin/cfg/cfghost.c
+++ b/src/libadmin/cfg/cfghost.c
@@ -39,6 +39,9 @@ RCSID
 #include <unistd.h>
 #endif /* AFS_NT40_ENV */
 
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_AdminErrors.h>
 #include <afs/afs_utilAdmin.h>

diff --git a/src/libadmin/cfg/cfgservers.c b/src/libadmin/cfg/cfgservers.c
index fd98aa55104e39db7ea246820f206992602c9124..a56dda42c6ad35bfc91c525c855795956f7c1f92 100644 (file)
--- a/src/libadmin/cfg/cfgservers.c
+++ b/src/libadmin/cfg/cfgservers.c
@@ -37,6 +37,9 @@ RCSID
 
 #include <pthread.h>
 
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_AdminErrors.h>
 #include <afs/afs_bosAdmin.h>

diff --git a/src/libadmin/client/afs_clientAdmin.c b/src/libadmin/client/afs_clientAdmin.c
index 725c26d2d392ee2c72e05e78eedee904e27e242e..5a37786b2a8885aa57c7712b2941217c016d43b6 100644 (file)
--- a/src/libadmin/client/afs_clientAdmin.c
+++ b/src/libadmin/client/afs_clientAdmin.c
@@ -38,6 +38,7 @@ RCSID
 #include <string.h>
 #include <afs/kautils.h>
 #include <rx/rx.h>
+#include <rx/rxstat.h>
 #include <rx/rx_null.h>
 #include <rx/rxkad.h>
 #include <afs/dirpath.h>

diff --git a/src/libadmin/kas/afs_kasAdmin.c b/src/libadmin/kas/afs_kasAdmin.c
index d3bbdce1d0eda8660b09ff49c0da0462df668380..2038470bd7bac2322abc4bd89bc15e83c09d9561 100644 (file)
--- a/src/libadmin/kas/afs_kasAdmin.c
+++ b/src/libadmin/kas/afs_kasAdmin.c
@@ -17,6 +17,8 @@ RCSID
 #include <string.h>
 
 #include <afs/stds.h>
+#include <rx/rx.h>
+#include <rx/rxstat.h>
 #include "afs_kasAdmin.h"
 #include "../adminutil/afs_AdminInternal.h"
 #include <afs/afs_AdminErrors.h>

diff --git a/src/libadmin/pts/afs_ptsAdmin.c b/src/libadmin/pts/afs_ptsAdmin.c
index 07286a1d64c5b808cd34dcb210422fb229dccf9f..e6e43f7332cd3aa3d64db4bf0d0aaa39ac43dbb9 100644 (file)
--- a/src/libadmin/pts/afs_ptsAdmin.c
+++ b/src/libadmin/pts/afs_ptsAdmin.c
@@ -15,6 +15,8 @@ RCSID
 
 #include <stdio.h>
 #include <afs/stds.h>
+#include <rx/rx.h>
+#include <rx/rxstat.h>
 #include "afs_ptsAdmin.h"
 #include "../adminutil/afs_AdminInternal.h"
 #include <afs/afs_AdminErrors.h>

diff --git a/src/libadmin/samples/cm_client_config.c b/src/libadmin/samples/cm_client_config.c
index 48ec3576181b56d00dfe678d174ceae25a3283db..866ff991d7d5bba40a2d9337305b7a5be775a2ff 100644 (file)
--- a/src/libadmin/samples/cm_client_config.c
+++ b/src/libadmin/samples/cm_client_config.c
@@ -23,6 +23,10 @@ RCSID
 #include <winsock2.h>
 #include <pthread.h>
 #endif
+
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
@@ -34,7 +38,7 @@ pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 #endif /* AFS_DARWIN_ENV */
 
 void
-Usage()
+Usage(void)
 {
     fprintf(stderr, "Usage: cm_client_config <host> <port>\n");
     exit(1);
@@ -107,7 +111,7 @@ main(int argc, char *argv[])
     }
 
 
-    printf("\nClient configuration for %s (port %d):\n\n", srvrName,
+    printf("\nClient configuration for %s (port %ld):\n\n", srvrName,
           srvrPort);
     printf("    clientVersion:  %d\n", config.clientVersion);
     printf("    serverVersion:  %d\n", config.serverVersion);

diff --git a/src/libadmin/samples/cm_local_cell.c b/src/libadmin/samples/cm_local_cell.c
index a814ac3b93301f8b6fa4f38cba983720bc2ce63c..51e60918a8964ad005c37b100b83d2d0f82431a5 100644 (file)
--- a/src/libadmin/samples/cm_local_cell.c
+++ b/src/libadmin/samples/cm_local_cell.c
@@ -23,6 +23,10 @@ RCSID
 #include <winsock2.h>
 #include <pthread.h>
 #endif
+
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>

diff --git a/src/libadmin/samples/cm_server_prefs.c b/src/libadmin/samples/cm_server_prefs.c
index cdae973a23f1b43b827b3e8100cb0651c27d7e2b..76ccd62873f81157f9e87596e88b105b9df61b07 100644 (file)
--- a/src/libadmin/samples/cm_server_prefs.c
+++ b/src/libadmin/samples/cm_server_prefs.c
@@ -23,6 +23,10 @@ RCSID
 #include <winsock2.h>
 #include <pthread.h>
 #endif
+
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>

diff --git a/src/libadmin/samples/rxdebug_basic_stats.c b/src/libadmin/samples/rxdebug_basic_stats.c
index 6289eeedb329693d99b5cb5590d05900e4de9b3d..728aa6a609ff476337a6b0449a323210a4a3b788 100644 (file)
--- a/src/libadmin/samples/rxdebug_basic_stats.c
+++ b/src/libadmin/samples/rxdebug_basic_stats.c
@@ -23,6 +23,10 @@ RCSID
 #include <winsock2.h>
 #include <pthread.h>
 #endif
+
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>

diff --git a/src/libadmin/samples/rxdebug_conns.c b/src/libadmin/samples/rxdebug_conns.c
index 2e0ff99fbb0d5460e9e8bc2090f2ca2be4c256ed..c405ca30ee0b3d309df42faabb8e618ede7df0db 100644 (file)
--- a/src/libadmin/samples/rxdebug_conns.c
+++ b/src/libadmin/samples/rxdebug_conns.c
@@ -23,6 +23,10 @@ RCSID
 #include <winsock2.h>
 #include <pthread.h>
 #endif
+
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>

diff --git a/src/libadmin/samples/rxdebug_peers.c b/src/libadmin/samples/rxdebug_peers.c
index c0a3a3d61ee64734993803457500be8c8e3e45dd..17bcb40f291497186462ff62547f0a1bf9b71fdd 100644 (file)
--- a/src/libadmin/samples/rxdebug_peers.c
+++ b/src/libadmin/samples/rxdebug_peers.c
@@ -23,6 +23,10 @@ RCSID
 #include <winsock2.h>
 #include <pthread.h>
 #endif
+
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>

diff --git a/src/libadmin/samples/rxdebug_rx_stats.c b/src/libadmin/samples/rxdebug_rx_stats.c
index 2a3de6b8b3ea3b680007ca7710e00b2710447494..9d4dbda63b3d53e2374fccbe6cfa702046f62940 100644 (file)
--- a/src/libadmin/samples/rxdebug_rx_stats.c
+++ b/src/libadmin/samples/rxdebug_rx_stats.c
@@ -24,6 +24,10 @@ RCSID
 #include <pthread.h>
 #endif
 #include <string.h>
+
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>

diff --git a/src/libadmin/samples/rxdebug_supported_stats.c b/src/libadmin/samples/rxdebug_supported_stats.c
index 0d5062d998fce23b02cb1822b4f187dd8a41e9ec..7bf67e3e1000a159bb11eb20854656e7bbf9a061 100644 (file)
--- a/src/libadmin/samples/rxdebug_supported_stats.c
+++ b/src/libadmin/samples/rxdebug_supported_stats.c
@@ -23,6 +23,10 @@ RCSID
 #include <winsock2.h>
 #include <pthread.h>
 #endif
+
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>

diff --git a/src/libadmin/samples/rxdebug_version.c b/src/libadmin/samples/rxdebug_version.c
index d88aea0f96c9f440ee2382c92519dda55cf79f31..500686181ee42e936345711a944fc9e978e11457 100644 (file)
--- a/src/libadmin/samples/rxdebug_version.c
+++ b/src/libadmin/samples/rxdebug_version.c
@@ -23,6 +23,10 @@ RCSID
 #include <winsock2.h>
 #include <pthread.h>
 #endif
+
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>

diff --git a/src/libadmin/samples/rxstat_clear_peer.c b/src/libadmin/samples/rxstat_clear_peer.c
index 7c4de27fae03871a1476442d14161effed46894b..7827ddc5def9eafbb049b1f3e53f6a35d63898bc 100644 (file)
--- a/src/libadmin/samples/rxstat_clear_peer.c
+++ b/src/libadmin/samples/rxstat_clear_peer.c
@@ -23,6 +23,10 @@ RCSID
 #include <winsock2.h>
 #include <pthread.h>
 #endif
+
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
@@ -36,7 +40,7 @@ pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 extern int RXSTATS_ClearPeerRPCStats();
 
 void
-Usage()
+Usage(void)
 {
     fprintf(stderr, "Usage: rxstat_clear_peer <cell> <host> <port>\n");
     exit(1);

diff --git a/src/libadmin/samples/rxstat_clear_process.c b/src/libadmin/samples/rxstat_clear_process.c
index b17eb6d2d8f16f8de5d203d5c683938416446e5a..d77adda823904405279571c0f5abe077580a45bc 100644 (file)
--- a/src/libadmin/samples/rxstat_clear_process.c
+++ b/src/libadmin/samples/rxstat_clear_process.c
@@ -23,6 +23,10 @@ RCSID
 #include <winsock2.h>
 #include <pthread.h>
 #endif
+
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
@@ -36,7 +40,7 @@ pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 extern int RXSTATS_ClearProcessRPCStats();
 
 void
-Usage()
+Usage(void)
 {
     fprintf(stderr, "Usage: rxstat_clear_process <cell> <host> <port>\n");
     exit(1);

diff --git a/src/libadmin/samples/rxstat_disable_peer.c b/src/libadmin/samples/rxstat_disable_peer.c
index 2690e343db005fc421bdf86d45bcbdb9ced6e923..ef80be2b0e0adcd0f106f4b071cb572cc10dc22f 100644 (file)
--- a/src/libadmin/samples/rxstat_disable_peer.c
+++ b/src/libadmin/samples/rxstat_disable_peer.c
@@ -23,6 +23,10 @@ RCSID
 #include <winsock2.h>
 #include <pthread.h>
 #endif
+
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
@@ -33,10 +37,8 @@ pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 #endif /* AFS_DARWIN_ENV */
 
-extern int RXSTATS_DisablePeerRPCStats();
-
 void
-Usage()
+Usage(void)
 {
     fprintf(stderr, "Usage: rxstat_disable_peer <cell> <host> <port>\n");
     exit(1);

diff --git a/src/libadmin/samples/rxstat_disable_process.c b/src/libadmin/samples/rxstat_disable_process.c
index 1012a5d43304f84c3424b9eb033f47a787936b85..a174b03b0ae6c6694edbbe66f6d130461faac54f 100644 (file)
--- a/src/libadmin/samples/rxstat_disable_process.c
+++ b/src/libadmin/samples/rxstat_disable_process.c
@@ -23,6 +23,10 @@ RCSID
 #include <winsock2.h>
 #include <pthread.h>
 #endif
+
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
@@ -33,10 +37,8 @@ pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 #endif /* AFS_DARWIN_ENV */
 
-extern int RXSTATS_DisableProcessRPCStats();
-
 void
-Usage()
+Usage(void)
 {
     fprintf(stderr, "Usage: rxstat_disable_process <cell> <host> <port>\n");
     exit(1);

diff --git a/src/libadmin/samples/rxstat_enable_peer.c b/src/libadmin/samples/rxstat_enable_peer.c
index 8b6929ef7ff0d58dbe154bc854b5421b94d12bff..ce8ebc9ca02f115ac08eaad88795033453e73300 100644 (file)
--- a/src/libadmin/samples/rxstat_enable_peer.c
+++ b/src/libadmin/samples/rxstat_enable_peer.c
@@ -23,6 +23,10 @@ RCSID
 #include <winsock2.h>
 #include <pthread.h>
 #endif
+
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
@@ -33,10 +37,8 @@ pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 #endif /* AFS_DARWIN_ENV */
 
-extern int RXSTATS_EnablePeerRPCStats();
-
 void
-Usage()
+Usage(void)
 {
     fprintf(stderr, "Usage: rxstat_enable_peer <cell> <host> <port>\n");
     exit(1);

diff --git a/src/libadmin/samples/rxstat_get_peer.c b/src/libadmin/samples/rxstat_get_peer.c
index 0632411ea2a42aff90d3b7c7cb0a8c7648f6b76a..6bc52e2176136c196525edab2cbd3fadc1d29191 100644 (file)
--- a/src/libadmin/samples/rxstat_get_peer.c
+++ b/src/libadmin/samples/rxstat_get_peer.c
@@ -26,6 +26,9 @@ RCSID
 
 #include <string.h>
 
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_AdminErrors.h>
 #include <afs/afs_clientAdmin.h>
@@ -37,7 +40,6 @@ pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 #endif /* AFS_DARWIN_ENV */
 
-#include <rx/rxstat.h>
 #include <afs/afsint.h>
 #define FSINT_COMMON_XG
 #include <afs/afscbint.h>
@@ -56,10 +58,8 @@ pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 #include <arpa/inet.h>         /* for inet_ntoa() */
 #endif
 
-extern int RXSTATS_RetrievePeerRPCStats();
-
 void
-Usage()
+Usage(void)
 {
     fprintf(stderr, "Usage: rxstat_get_peer <cell> <host> <port>\n");
     exit(1);

diff --git a/src/libadmin/samples/rxstat_get_process.c b/src/libadmin/samples/rxstat_get_process.c
index 6c7bc35716a672f6d332ea1d5dba75105c90dd53..9e7d780ba9e533be74997c7d381051362d645d9e 100644 (file)
--- a/src/libadmin/samples/rxstat_get_process.c
+++ b/src/libadmin/samples/rxstat_get_process.c
@@ -25,6 +25,9 @@ RCSID
 #endif
 #include <string.h>
 
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_AdminErrors.h>
 #include <afs/afs_clientAdmin.h>
@@ -36,7 +39,6 @@ pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 #endif /* AFS_DARWIN_ENV */
 
-#include <rx/rxstat.h>
 #include <afs/afsint.h>
 #define FSINT_COMMON_XG
 #include <afs/afscbint.h>
@@ -52,8 +54,6 @@ pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 #include <ubik.h>
 #include <ubik_int.h>
 
-extern int RXSTATS_RetrieveProcessRPCStats();
-
 void
 Usage()
 {

diff --git a/src/libadmin/samples/rxstat_get_version.c b/src/libadmin/samples/rxstat_get_version.c
index c49d89ea01d3cddea0a37e350e4cf3826b02f5ff..e15627a908f0f8f86881c2326437a2d8883331f4 100644 (file)
--- a/src/libadmin/samples/rxstat_get_version.c
+++ b/src/libadmin/samples/rxstat_get_version.c
@@ -23,6 +23,10 @@ RCSID
 #include <winsock2.h>
 #include <pthread.h>
 #endif
+
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
@@ -34,7 +38,7 @@ pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 #endif /* AFS_DARWIN_ENV */
 
 void
-Usage()
+Usage(void)
 {
     fprintf(stderr, "Usage: rxstat_get_version <host> <port>\n");
     exit(1);

diff --git a/src/libadmin/samples/rxstat_query_peer.c b/src/libadmin/samples/rxstat_query_peer.c
index 2845f3afd4d9555bf0a2698dbd531c840e6272e7..abfc6aebdf04e687e32942c5766def85d61f2409 100644 (file)
--- a/src/libadmin/samples/rxstat_query_peer.c
+++ b/src/libadmin/samples/rxstat_query_peer.c
@@ -23,6 +23,10 @@ RCSID
 #include <winsock2.h>
 #include <pthread.h>
 #endif
+
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>
@@ -33,10 +37,8 @@ pthread_mutex_t des_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 pthread_mutex_t rxkad_random_mutex = PTHREAD_MUTEX_INITIALIZER;
 #endif /* AFS_DARWIN_ENV */
 
-extern int RXSTATS_QueryPeerRPCStats();
-
 void
-Usage()
+Usage(void)
 {
     fprintf(stderr, "Usage: rxstat_query_peer <host> <port>\n");
     exit(1);

diff --git a/src/libadmin/test/afscp.c b/src/libadmin/test/afscp.c
index af0fb22a8c192cadffa43b44d6fc66e1f5a71e33..7b740068920d73bb7fa0034a696f7b1cfae9119b 100644 (file)
--- a/src/libadmin/test/afscp.c
+++ b/src/libadmin/test/afscp.c
@@ -27,6 +27,9 @@ RCSID
 
 #include <pthread.h>
 
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_utilAdmin.h>
 #include <afs/afs_clientAdmin.h>

diff --git a/src/libadmin/test/bos.h b/src/libadmin/test/bos.h
index dd873fb87a29c21a5a7f40852f2477b76cc4dc64..3319d7051960a16ea3148b515ee2bf6e9f26eaf2 100644 (file)
--- a/src/libadmin/test/bos.h
+++ b/src/libadmin/test/bos.h
@@ -21,6 +21,9 @@
 
 #include <pthread.h>
 
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_bosAdmin.h>
 #include <afs/afs_utilAdmin.h>

diff --git a/src/libadmin/test/client.h b/src/libadmin/test/client.h
index 0ba0910bca670e5240b7f7b7729e9689f16297fb..c2e4783ab93ddda85136b5a0a1994b3507e18299 100644 (file)
--- a/src/libadmin/test/client.h
+++ b/src/libadmin/test/client.h
@@ -21,6 +21,9 @@
 
 #include <pthread.h>
 
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_clientAdmin.h>
 #include <afs/afs_utilAdmin.h>

diff --git a/src/libadmin/test/kas.h b/src/libadmin/test/kas.h
index 199c439f19984a7cbc5ebd0e9a38f37264b62e43..9984a33965e04ea8a91b3b3ad8abd5bbb0d354c8 100644 (file)
--- a/src/libadmin/test/kas.h
+++ b/src/libadmin/test/kas.h
@@ -21,6 +21,9 @@
 
 #include <pthread.h>
 
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_kasAdmin.h>
 #include <afs/afs_utilAdmin.h>

diff --git a/src/libadmin/test/util.h b/src/libadmin/test/util.h
index 98f22f6b42a3935623756ea112023176f3160685..5ea0bfb7ead61a856b2cd849fa2f827eac07b690 100644 (file)
--- a/src/libadmin/test/util.h
+++ b/src/libadmin/test/util.h
@@ -21,6 +21,9 @@
 
 #include <pthread.h>
 
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_utilAdmin.h>
 

diff --git a/src/libadmin/test/vos.h b/src/libadmin/test/vos.h
index fc91113769fa1312a0c262c4651d13fa753604d4..39a64d52b3ab2888c802f6c01cda277d2cc92ce1 100644 (file)
--- a/src/libadmin/test/vos.h
+++ b/src/libadmin/test/vos.h
@@ -21,6 +21,9 @@
 
 #include <pthread.h>
 
+#include <rx/rx.h>
+#include <rx/rxstat.h>
+
 #include <afs/afs_Admin.h>
 #include <afs/afs_vosAdmin.h>
 #include <afs/afs_utilAdmin.h>

diff --git a/src/libadmin/vos/afs_vosAdmin.c b/src/libadmin/vos/afs_vosAdmin.c
index 15d1701295f96a3425e5a8123f0ba9c2bed9993a..492c461b6309f7be7b7dc308ee4a0561239392e4 100644 (file)
--- a/src/libadmin/vos/afs_vosAdmin.c
+++ b/src/libadmin/vos/afs_vosAdmin.c
@@ -30,12 +30,13 @@ RCSID
 #endif
 #include "afs_vosAdmin.h"
 #include "../adminutil/afs_AdminInternal.h"
-#include <afs/afs_utilAdmin.h>
 #include <afs/vlserver.h>
 #include <afs/volser.h>
 #include <afs/volint.h>
 #include <afs/partition.h>
 #include <rx/rx.h>
+#include <rx/rxstat.h>
+#include <afs/afs_utilAdmin.h>
 #include "vosutils.h"
 #include "vsprocs.h"
 #include "lockprocs.h"

diff --git a/src/libadmin/vos/lockprocs.h b/src/libadmin/vos/lockprocs.h
index 38b9dbc8996bcf02014d8b05f22830b9037cefdd..e84e4e5f691600fb924abfbe26aae40d3717856b 100644 (file)
--- a/src/libadmin/vos/lockprocs.h
+++ b/src/libadmin/vos/lockprocs.h
@@ -16,6 +16,7 @@
 #include <afs/voldefs.h>
 #include <rx/xdr.h>
 #include <rx/rx.h>
+#include <rx/rxstat.h>
 #include <afs/vlserver.h>
 #include <afs/nfs.h>
 #include <afs/afsint.h>