2008-08-18 Joel Sherrill <joel.sherrill@oarcorp.com>

	* libnetworking/lib/ftpfs.c, libnetworking/libc/inet_ntoa.c,
	libnetworking/libc/rcmd.c, libnetworking/nfs/bootp_subr.c,
	libnetworking/rtems/rtems_glue.c,
	libnetworking/rtems/rtems_malloc_mbuf.c,
	libnetworking/rtems/rtems_showicmpstat.c, libnetworking/sys/malloc.h:
	Fix some warnings.

3 files changed, 24 insertions, 7 deletions

diff --git a/cpukit/libnetworking/rtems/rtems_glue.c b/cpukit/libnetworking/rtems/rtems_glue.c
index 52db0e0f49..1508412940 100644
--- a/cpukit/libnetworking/rtems/rtems_glue.c
+++ b/cpukit/libnetworking/rtems/rtems_glue.c
@@ -138,6 +138,12 @@ rtems_bsdnet_free (void *addr, int type)
 }
 
 /*
+ * Externs for BSD data we have to access during initialization
+ */
+extern struct domain routedomain;
+extern struct domain inetdomain;
+
+/*
  * Do the initializations required by the BSD code
  */
 static int
@@ -192,8 +198,6 @@ bsd_init (void)
 	 * Set up domains
 	 */
 	{
-	extern struct domain routedomain;
-	extern struct domain inetdomain;
 
 	routedomain.dom_next = domains;
 	domains = &routedomain;
@@ -215,15 +219,19 @@ bsd_init (void)
 }
 
 /*
+ * RTEMS Specific Helper Routines
+ */
+extern void rtems_set_udp_buffer_sizes( u_long, u_long );
+extern void rtems_set_tcp_buffer_sizes( u_long, u_long );
+extern void rtems_set_sb_efficiency( u_long );
+
+/*
  * Initialize and start network operations
  */
 static int
 rtems_bsdnet_initialize (void)
 {
 	rtems_status_code sc;
-        extern void rtems_set_udp_buffer_sizes( u_long, u_long );
-        extern void rtems_set_tcp_buffer_sizes( u_long, u_long );
-        extern void rtems_set_sb_efficiency( u_long );
 
 	/*
 	 * Set the priority of all network tasks
diff --git a/cpukit/libnetworking/rtems/rtems_malloc_mbuf.c b/cpukit/libnetworking/rtems/rtems_malloc_mbuf.c
index ca7f527614..628d7dc23f 100644
--- a/cpukit/libnetworking/rtems/rtems_malloc_mbuf.c
+++ b/cpukit/libnetworking/rtems/rtems_malloc_mbuf.c
@@ -21,13 +21,18 @@
 #include <rtems/rtems_bsdnet.h>
 
 /*
+ * We want to use the REAL system malloc.  Do not let the BSD malloc macro
+ * invade this file.
+ */
+extern void *malloc(size_t);
+
+/*
  * Default allocator for mbuf data. Over-ride in user code to change 
  * the way mbuf's are allocated.
  */
 
 void* rtems_bsdnet_malloc_mbuf(size_t size, int type)
 {
-   extern void *malloc(size_t);
    return malloc(size);
 }
 
diff --git a/cpukit/libnetworking/rtems/rtems_showicmpstat.c b/cpukit/libnetworking/rtems/rtems_showicmpstat.c
index c2dfefdd28..15c19c012c 100644
--- a/cpukit/libnetworking/rtems/rtems_showicmpstat.c
+++ b/cpukit/libnetworking/rtems/rtems_showicmpstat.c
@@ -31,12 +31,16 @@ showicmpstat (const char *name, unsigned long n)
 		printf ("%35s%12lu\n", name, n);
 }
 
+/*
+ * External data we peek at during statistics reporting
+ */
+extern unsigned int icmplenPanicAvoided;
+
 void
 rtems_bsdnet_show_icmp_stats (void)
 {
 	int i;
 	char cbuf[20];
-	extern unsigned int icmplenPanicAvoided;
 
 	printf ("************ ICMP Statistics ************\n");
 	showicmpstat ("Calls to icmp_error()", icmpstat.icps_error);