From e63a93f371729d565b37aaacb29734faafc938a2 Mon Sep 17 00:00:00 2001
From: Nathan Neulinger <nneul@umr.edu>
Date: Tue, 5 Jun 2001 15:32:46 +0000
Subject: [PATCH] rx-warning-cleanup-and-afsconfig-20010605

clean up previous rxtrace patch and clean up other warnings
---
 src/rx/rx_trace.c |  6 ++++++
 src/rx/rx_user.c  | 15 +++++++++++----
 src/rx/rxdebug.c  |  6 ++++--
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/rx/rx_trace.c b/src/rx/rx_trace.c
index 1a5241fa5..40f43d49b 100644
--- a/src/rx/rx_trace.c
+++ b/src/rx/rx_trace.c
@@ -10,7 +10,13 @@
 #ifdef RXDEBUG
 
 #include <afs/param.h>
+#include <afsconfig.h>
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 #ifdef AFS_NT40_ENV
 #include <fcntl.h>
 #include <io.h>
diff --git a/src/rx/rx_user.c b/src/rx/rx_user.c
index d65600622..7d9f603f5 100644
--- a/src/rx/rx_user.c
+++ b/src/rx/rx_user.c
@@ -10,6 +10,7 @@
 /* rx_user.c contains routines specific to the user space UNIX implementation of rx */
 
 # include <afs/param.h>
+# include <afsconfig.h>
 # include <sys/types.h>
 # include <errno.h>
 # include <signal.h>
@@ -31,6 +32,12 @@
 #endif
 #include <afs/afs_args.h>
 #include <afs/afsutil.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 
 #ifndef	IPPORT_USERRESERVED
 /* If in.h doesn't define this, define it anyway.  Unfortunately, defining
@@ -45,8 +52,8 @@
 # include "rx.h"
 # include "rx_globals.h"
 
-
 extern void rxi_Delay();
+extern void rxi_MorePackets();
 
 #ifdef AFS_PTHREAD_ENV
 #include <assert.h>
@@ -86,12 +93,12 @@ pthread_mutex_t rx_if_mutex;
  */
 osi_socket rxi_GetUDPSocket(u_short port)
 {
-    int binds, code;
+    int binds, code=0;
     osi_socket socketFd = OSI_NULLSOCKET;
     struct sockaddr_in taddr;
     char *name = "rxi_GetUDPSocket: ";
     extern int rxi_Listen(osi_socket sock);
-    int greedy;
+    int greedy=0;
 
 #if !defined(AFS_NT40_ENV) && !defined(AFS_DJGPP_ENV)
     if (ntohs(port) >= IPPORT_RESERVED && ntohs(port) < IPPORT_USERRESERVED) {
@@ -348,7 +355,7 @@ void rx_GetIFInfo()
 #ifndef AFS_DJGPP_ENV
     struct ifconf   ifc;
     struct ifreq    ifs[ADDRSPERSITE];
-    struct ifreq ifreq, *ifr;
+    struct ifreq *ifr;
 #ifdef	AFS_AIX41_ENV
     char buf[BUFSIZ], *cp, *cplim;
 #endif
diff --git a/src/rx/rxdebug.c b/src/rx/rxdebug.c
index 1cd7ffddd..1ec3eb2b4 100644
--- a/src/rx/rxdebug.c
+++ b/src/rx/rxdebug.c
@@ -18,7 +18,9 @@
 #include <netdb.h>
 #include <netinet/in.h>
 #include <sys/time.h>
+#include <unistd.h>
 #endif
+#include <string.h>
 #include <sys/stat.h>
 #include <afs/stds.h>
 #include <afs/cmd.h>
@@ -60,7 +62,7 @@ register char *aname;
     return ts->s_port;	/* returns it in network byte order */
 }
 
-MainCommand(as, arock)
+int MainCommand(as, arock)
 char *arock;
 struct cmd_syndesc *as;
 {
@@ -491,7 +493,7 @@ struct cmd_syndesc *as;
 #ifndef AFS_NT40_ENV
 #include "AFS_component_version_number.c"
 #endif
-main(argc, argv)
+int main(argc, argv)
 int argc;
 char **argv;
 {
-- 
2.39.5