rx-warnings-and-prototyping-20010623

suppress more warnings in rx; also creat missing prototypes

diff --git a/src/rx/rx.c b/src/rx/rx.c
index 4509653b747093764cee4ea7159b893d223eeb53..5337a508e6aaa4a45935d50a1ea947ed6c7391bc 100644 (file)
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -221,8 +221,6 @@ assert(pthread_once(&rx_once_init, rxi_InitPthread)==0);
 #define INIT_PTHREAD_LOCKS
 #endif
 
-extern void rxi_DeleteCachedConnections(void);
-
 
 /* Variables for handling the minProcs implementation.  availProcs gives the
  * number of threads available in the pool at this moment (not counting dudes
@@ -246,11 +244,8 @@ extern void rxi_DeleteCachedConnections(void);
  * to manipulate the queue.
  */
 
-extern void rxi_Delay(int);
-
-static int rxi_ServerThreadSelectingCall;
-
 #ifdef RX_ENABLE_LOCKS
+static int rxi_ServerThreadSelectingCall;
 static afs_kmutex_t rx_rpc_stats;
 void rxi_StartUnlocked();
 #endif
@@ -300,8 +295,6 @@ void osirx_AssertMine(afs_kmutex_t *lockaddr, char *msg);
 #define CLEAR_CALL_QUEUE_LOCK(C)
 #endif /* RX_ENABLE_LOCKS */
 static void rxi_DestroyConnectionNoLock();
-void rxi_DestroyConnection();
-void rxi_CleanupConnection();
 struct rx_serverQueueEntry *rx_waitForPacket = 0;
 
 /* ------------Exported Interfaces------------- */
@@ -570,7 +563,7 @@ register struct rx_service *aservice;
 }
 
 #else /* RX_ENABLE_LOCKS */
-static QuotaOK(aservice)
+static int QuotaOK(aservice)
 register struct rx_service *aservice; {
     int rc=0;
     /* under min quota, we're OK */
@@ -666,14 +659,13 @@ void rx_StartServer(donateMe)
     if (donateMe) {
 #ifndef AFS_NT40_ENV
 #ifndef KERNEL
-       int code;
         char name[32];
 #ifdef AFS_PTHREAD_ENV
         pid_t pid;
         pid = (pid_t) pthread_self();
 #else /* AFS_PTHREAD_ENV */
         PROCESS pid;
-        code = LWP_CurrentProcess(&pid);
+        LWP_CurrentProcess(&pid);
 #endif /* AFS_PTHREAD_ENV */
 
         sprintf(name,"srv_%d", ++nProcs);
@@ -1077,6 +1069,7 @@ struct rx_call *rx_NewCall(conn)
     return call;
 }
 
+int
 rxi_HasActiveCalls(aconn)
 register struct rx_connection *aconn; {
     register int i;
@@ -1097,6 +1090,7 @@ register struct rx_connection *aconn; {
     return 0;
 }
 
+int
 rxi_GetCallNumberVector(aconn, aint32s)
 register struct rx_connection *aconn;
 register afs_int32 *aint32s; {
@@ -1115,6 +1109,7 @@ register afs_int32 *aint32s; {
     return 0;
 }
 
+int
 rxi_SetCallNumberVector(aconn, aint32s)
 register struct rx_connection *aconn;
 register afs_int32 *aint32s; {
@@ -1380,12 +1375,12 @@ osi_socket *socketp;
 {
     struct rx_serverQueueEntry *sq;
     register struct rx_call *call = (struct rx_call *) 0, *choice2;
-    struct rx_service *service;
+    struct rx_service *service = NULL;
     SPLVAR;
 
     MUTEX_ENTER(&freeSQEList_lock);
 
-    if (sq = rx_FreeSQEList) {
+    if ((sq = rx_FreeSQEList)) {
        rx_FreeSQEList = *(struct rx_serverQueueEntry **)sq;
        MUTEX_EXIT(&freeSQEList_lock);
     } else {    /* otherwise allocate a new one and return that */
@@ -3263,8 +3258,9 @@ struct rx_packet *rxi_ReceiveAckPacket(call, np, istack)
     if (rx_Log) {
       fprintf( rx_Log, 
              "RACK: reason %x previous %u seq %u serial %u skew %d first %u",
-             ap->reason, ntohl(ap->previousPacket), np->header.seq, serial, 
-             skew, ntohl(ap->firstPacket));
+             ap->reason, ntohl(ap->previousPacket), 
+             (unsigned int) np->header.seq, (unsigned int) serial, 
+             (unsigned int) skew, ntohl(ap->firstPacket));
        if (nAcks) {
            int offset;
            for (offset = 0; offset < nAcks; offset++) 
@@ -4450,8 +4446,8 @@ struct rx_packet *rxi_SendAck(call, optionalPacket, seq, serial, pflags, reason,
 #ifdef RXDEBUG
     if (rx_Log) {
        fprintf(rx_Log, "SACK: reason %x previous %u seq %u first %u",
-               ap->reason, ntohl(ap->previousPacket), p->header.seq, 
-               ntohl(ap->firstPacket));
+               ap->reason, ntohl(ap->previousPacket), 
+               (unsigned int) p->header.seq, ntohl(ap->firstPacket));
        if (ap->nAcks) {
            for (offset = 0; offset < ap->nAcks; offset++) 
                putc(ap->acks[offset] == RX_ACK_TYPE_NACK? '-' : '*', rx_Log);
@@ -5316,7 +5312,6 @@ void rxi_ComputeRoundTripTime(p, sentp, peer)
        struct timeval temptime;
 #endif
       register int rtt_timeout;
-      static char id[]="@(#)adaptive RTO";
 
 #if defined(AFS_ALPHA_LINUX20_ENV) && defined(AFS_PTHREAD_ENV) && !defined(KERNEL)
       /* yet again. This was the worst Heisenbug of the port - stroucki */
@@ -5746,7 +5741,7 @@ rxi_DebugPrint(format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
 {
     struct clock now;
     clock_GetTime(&now);
-    fprintf(rx_Log, " %u.%.3u:", now.sec, now.usec/1000);
+    fprintf(rx_Log, " %u.%.3u:", (unsigned int) now.sec, (unsigned int) now.usec/1000);
     fprintf(rx_Log, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15);
     putc('\n', rx_Log);
 }
@@ -5775,9 +5770,8 @@ void rx_PrintTheseStats (file, s, size, freePackets, version)
     }
 
     fprintf(file,
-           "rx stats: free packets %d, "
-           "allocs %d, ",
-           freePackets,
+           "rx stats: free packets %d, allocs %d, ",
+           (int) freePackets,
            s->packetRequests);
 
     if (version >= RX_DEBUGI_VERSION_W_NEWPACKETTYPES) {
@@ -5857,7 +5851,7 @@ void rx_PrintTheseStats (file, s, size, freePackets, version)
            "   \t(these should be small) sendFailed %d, "
            "fatalErrors %d\n", 
            s->netSendFailures,
-           s->fatalErrors);
+           (int) s->fatalErrors);
 
     if (s->nRttSamples) {
        fprintf(file,
@@ -5909,10 +5903,10 @@ struct rx_peer *peer;
            "Burst size %d, "
            "burst wait %u.%d.\n",
            ntohl(peer->host),
-           peer->port,
-           peer->burstSize,
-           peer->burstWait.sec,
-           peer->burstWait.usec);
+           (int) peer->port,
+           (int) peer->burstSize,
+           (int) peer->burstWait.sec,
+           (int) peer->burstWait.usec);
 
     fprintf(file,
            "   Rtt %d, "
@@ -5920,8 +5914,8 @@ struct rx_peer *peer;
            "total sent %d, "
            "resent %d\n",
            peer->rtt,
-           peer->timeout.sec,
-           peer->timeout.usec,
+           (int) peer->timeout.sec,
+           (int) peer->timeout.usec,
            peer->nSent,
            peer->reSends);
 
@@ -5930,8 +5924,8 @@ struct rx_peer *peer;
            "max in packet skew %d, "
            "max out packet skew %d\n",
            peer->ifMTU,
-           peer->inPacketSkew,
-           peer->outPacketSkew);
+           (int) peer->inPacketSkew,
+           (int) peer->outPacketSkew);
 }
 
 #ifdef AFS_PTHREAD_ENV

diff --git a/src/rx/rx.h b/src/rx/rx.h
index e44f2d560ca827f03034b3dd44cb776a7493d4e3..addb64cff460d6bc5a7c1f5725492ed8e98b54a2 100644 (file)
--- a/src/rx/rx.h
+++ b/src/rx/rx.h
@@ -90,6 +90,10 @@ int rx_ReadProc();
 int rx_ReadvProc();
 int rx_ReadProc32();
 void rx_FlushWrite();
+void rxi_DeleteCachedConnections();
+void rxi_DestroyConnection();
+void rxi_CleanupConnection();
+int rxi_Listen();
 int rxi_WriteProc();
 int rxi_WritevProc();
 int rxi_WritevAlloc();
@@ -100,6 +104,7 @@ void rxi_FlushWrite();
 int rxi_getAllAddrMaskMtu();
 int rx_getAllAddr();
 void rxi_FreePacket();
+void rxi_FreePacketNoLock();
 int rxi_AllocDataBuf();
 void rxi_RestoreDataBufs();
 void rxi_Sleep();
@@ -116,6 +121,8 @@ void rxi_FreeAllPackets();
 void rxi_SendPacketList();
 void rxi_SendPacket();
 void rxi_MorePackets();
+void rxi_MorePacketsNoLock();
+void rxi_PacketsUnWait();
 void rx_CheckPackets();
 void rxi_Wakeup();
 void rx_PrintStats();
@@ -123,6 +130,9 @@ void rx_PrintPeerStats();
 void rx_SetArrivalProc();
 void rx_Finalize();
 void rx_GetIFInfo();
+void shutdown_rxevent();
+int clock_UnInit();
+void rxi_Delay(int);
 #ifndef KERNEL
 typedef void (*rx_destructor_t)(void *);
 int rx_KeyCreate(rx_destructor_t);

diff --git a/src/rx/rx_conncache.c b/src/rx/rx_conncache.c
index 685a9c68a1566f6c821ebc64eef477d281ad4c82..09d2e8adbd645b4f8e74271194143b9f05bb0e8d 100644 (file)
--- a/src/rx/rx_conncache.c
+++ b/src/rx/rx_conncache.c
@@ -24,7 +24,6 @@
 #include "rx.h"
 #endif /* UKERNEL */
 
-extern void rxi_DestroyConnection(struct rx_connection *);
 /*
  * We initialize rxi_connectionCache at compile time, so there is no
  * need to call queue_Init(&rxi_connectionCache).

diff --git a/src/rx/rx_event.c b/src/rx/rx_event.c
index c5a7ed8a8fffa6c661a09a18dd3fb7c8d0983625..ce580dcbf4e5b83516002c086e7e284749b1152c 100644 (file)
--- a/src/rx/rx_event.c
+++ b/src/rx/rx_event.c
@@ -178,7 +178,9 @@ struct rxevent *rxevent_Post(struct clock *when, void (*func)(),
     if (rx_Log_event) {
        struct clock now;
        clock_GetTime(&now);
-       fprintf(rx_Log_event, "%d.%d: rxevent_Post(%d.%d, %x, %x)\n", now.sec, now.usec, when->sec, when->usec, func, arg);
+       fprintf(rx_Log_event, "%d.%d: rxevent_Post(%d.%d, %x, %x)\n", 
+           (int) now.sec, (int) now.usec, (int) when->sec, 
+           (int) when->usec, (unsigned int) func, (unsigned int) arg);
     }
 #endif
 
@@ -290,9 +292,10 @@ void rxevent_Cancel_1(ev)
     if (rx_Log_event) {
        struct clock now;
        clock_GetTime(&now);
-       fprintf(rx_Log_event, "%d.%d: rxevent_Cancel_1(%d.%d, %x, %x)\n", now.sec,
-               now.usec, ev->eventTime.sec, ev->eventTime.usec, ev->func,
-               ev->arg);
+       fprintf(rx_Log_event, "%d.%d: rxevent_Cancel_1(%d.%d, %x, %x)\n", 
+               (int) now.sec, (int) now.usec, (int) ev->eventTime.sec, 
+               (int) ev->eventTime.usec, (unsigned int) ev->func,
+               (unsigned int) ev->arg);
     }
 #endif
     /* Append it to the free list (rather than prepending) to keep the free
@@ -380,7 +383,8 @@ int rxevent_RaiseEvents(next)
        } while (queue_IsNotEmpty(&ep->events));
     }
 #ifdef RXDEBUG
-    if (rx_Log_event) fprintf(rx_Log_event, "rxevent_RaiseEvents(%d.%d)\n", now.sec, now.usec);
+    if (rx_Log_event) fprintf(rx_Log_event, "rxevent_RaiseEvents(%d.%d)\n", 
+       (int) now.sec, (int) now.usec);
 #endif
     rxevent_raiseScheduled = 0;
     MUTEX_EXIT(&rxevent_lock);

diff --git a/src/rx/rx_getaddr.c b/src/rx/rx_getaddr.c
index 7ada196afb437e20b6ef40344f327d571ce36a0f..5e02a0af300047e5e98cd43e64d08f0a8b4f9f41 100644 (file)
--- a/src/rx/rx_getaddr.c
+++ b/src/rx/rx_getaddr.c
@@ -65,6 +65,7 @@ afs_int32 rxi_getaddr() {
 #ifndef KERNEL
 
 /* to satisfy those who call setaddr */
+int
 rxi_setaddr(x)
 afs_int32 x; {
     return 0;

diff --git a/src/rx/rx_packet.c b/src/rx/rx_packet.c
index 4e3a4f680d1725dd700b50ded1f555565b1fc735..fa35d93dd1844eed205950e2d4f421b35fcee55a 100644 (file)
--- a/src/rx/rx_packet.c
+++ b/src/rx/rx_packet.c
@@ -92,12 +92,9 @@ struct rx_packet *rx_mallocedP = 0;
 extern char cml_version_number[];
 extern int (*rx_almostSent)();
 
-void rxi_FreePacketNoLock(struct rx_packet *p);
 static void rxi_SendDebugPacket(struct rx_packet *apacket, osi_socket asocket,
-                              afs_int32 ahost, short aport, afs_int32 istack);
+                               afs_int32 ahost, short aport, afs_int32 istack);
 
-extern char cml_version_number[];
-extern int (*rx_almostSent)();
 /* some rules about packets:
  * 1.  When a packet is allocated, the final iov_buf contains room for
  * a security trailer, but iov_len masks that fact.  If the security
@@ -222,9 +219,6 @@ afs_int32 rx_SlowWritePacket(struct rx_packet *packet, int offset, int resid,
 static struct rx_packet * allocCBuf(int class)
 {
   struct rx_packet *c;
-#ifndef KERNEL
-  extern void rxi_MorePacketsNoLock();
-#endif /* !KERNEL */
   SPLVAR;
   
   NETPRI;
@@ -288,7 +282,6 @@ static struct rx_packet * allocCBuf(int class)
  */
 void rxi_freeCBuf(struct rx_packet *c)
 {
-  extern void rxi_PacketsUnWait();
   SPLVAR;
   
   NETPRI;
@@ -358,7 +351,6 @@ int rxi_AllocDataBuf(struct rx_packet *p, int nb, int class)
 /* Add more packet buffers */
 void rxi_MorePackets(int apackets)
 {
-  extern void rxi_PacketsUnWait();
   struct rx_packet *p, *e;
   int getme;
   SPLVAR;
@@ -395,7 +387,6 @@ void rxi_MorePackets(int apackets)
 /* Add more packet buffers */
 void rxi_MorePacketsNoLock(int apackets)
 {
-  extern void rxi_PacketsUnWait();
   struct rx_packet *p, *e;
   int getme;
 
@@ -521,7 +512,6 @@ int rxi_TrimDataBufs(p, first)
      struct rx_packet * p;
      int first;
 {
-  extern void rxi_PacketsUnWait();
   int length;
   struct iovec *iov, *end;
   SPLVAR;
@@ -564,7 +554,6 @@ int rxi_TrimDataBufs(p, first)
  * remove it yourself first if you call this routine. */
 void rxi_FreePacket(struct rx_packet *p)
 {
-  extern void rxi_PacketsUnWait();
   SPLVAR;
   
   NETPRI;

diff --git a/src/rx/rx_pthread.c b/src/rx/rx_pthread.c
index c81f86b05b5c2d2732a3a7805b0b145304e3f80e..da567a84104a44a8829cc6a761c5ff1141565a1e 100644 (file)
--- a/src/rx/rx_pthread.c
+++ b/src/rx/rx_pthread.c
@@ -69,7 +69,7 @@ struct clock rxi_clockNow;
 /*
  * Delay the current thread the specified number of seconds.
  */
-rxi_Delay(sec)
+void rxi_Delay(sec)
     int sec;
 {
     sleep(sec);

diff --git a/src/rx/rx_user.c b/src/rx/rx_user.c
index 7d9f603f56b7d3cfc16cf7e2bf2123eba9495dbb..5820e9ad8e8eff90cd0f7a4ea5e020c598aec429 100644 (file)
--- a/src/rx/rx_user.c
+++ b/src/rx/rx_user.c
@@ -52,9 +52,6 @@
 # include "rx.h"
 # include "rx_globals.h"
 
-extern void rxi_Delay();
-extern void rxi_MorePackets();
-
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
 
@@ -97,7 +94,6 @@ osi_socket rxi_GetUDPSocket(u_short port)
     osi_socket socketFd = OSI_NULLSOCKET;
     struct sockaddr_in taddr;
     char *name = "rxi_GetUDPSocket: ";
-    extern int rxi_Listen(osi_socket sock);
     int greedy=0;
 
 #if !defined(AFS_NT40_ENV) && !defined(AFS_DJGPP_ENV)

diff --git a/src/rx/xdr_rx.c b/src/rx/xdr_rx.c
index 5755b96a5875b9f0e1bd96c1266f3dccfe5356d1..0975c9b54c11e3665fbb40dc54904c39cfb30720 100644 (file)
--- a/src/rx/xdr_rx.c
+++ b/src/rx/xdr_rx.c
@@ -296,6 +296,7 @@ xdrrx_putbytes(xdrs, addr, len)
        return code;
 }
 
+#ifdef undef /* not used */
 static u_int
 xdrrx_getpos(xdrs)
        register XDR *xdrs;
@@ -312,6 +313,7 @@ xdrrx_setpos(xdrs, pos)
         /* Not supported */
         return FALSE;
 }
+#endif
 
 static AFS_RPC_INLINE_T *
 xdrrx_inline(xdrs, len)