From eb37712079b56245e7bb80cce6b3caff1aa6b507 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 3 Aug 2000 09:49:44 +0000
Subject: [PATCH] Fix the more obvious warnings to deal with my earlier warning
 cleanups.

---
 sys/boot/alpha/boot1/boot1.c         |  1 +
 sys/boot/alpha/libalpha/alpha_copy.c | 16 ++++++++--------
 sys/boot/alpha/libalpha/libalpha.h   |  6 +++---
 sys/boot/common/dev_net.c            |  1 -
 sys/boot/ofw/libofw/ofw_copy.c       | 16 ++++++++--------
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/sys/boot/alpha/boot1/boot1.c b/sys/boot/alpha/boot1/boot1.c
index b4dc9956ceb..2d2026a8687 100644
--- a/sys/boot/alpha/boot1/boot1.c
+++ b/sys/boot/alpha/boot1/boot1.c
@@ -30,6 +30,7 @@
  * rights to redistribute these changes.
  */
 
+#include <string.h>
 #include <sys/param.h>
 
 #include <machine/prom.h>
diff --git a/sys/boot/alpha/libalpha/alpha_copy.c b/sys/boot/alpha/libalpha/alpha_copy.c
index 95b6cba677e..12f56b1fcfd 100644
--- a/sys/boot/alpha/libalpha/alpha_copy.c
+++ b/sys/boot/alpha/libalpha/alpha_copy.c
@@ -34,22 +34,22 @@
 
 #include "libalpha.h"
 
-int
-alpha_copyin(void *src, vm_offset_t dest, size_t len)
+ssize_t
+alpha_copyin(const void *src, vm_offset_t dest, const size_t len)
 {
-    bcopy(src, dest, len);
+    bcopy(src, (void *)dest, len);
     return(len);
 }
 
-int
-alpha_copyout(vm_offset_t src, void *dest, size_t len)
+ssize_t
+alpha_copyout(const vm_offset_t src, void *dest, const size_t len)
 {
-    bcopy(src, dest, len);
+    bcopy((void *)src, dest, len);
     return(len);
 }
 
-int
-alpha_readin(int fd, vm_offset_t dest, size_t len)
+ssize_t
+alpha_readin(const int fd, vm_offset_t dest, const size_t len)
 {
     return(read(fd, (void *) dest, len));
 }
diff --git a/sys/boot/alpha/libalpha/libalpha.h b/sys/boot/alpha/libalpha/libalpha.h
index 8e1dd71e09f..4790aaf9ab1 100644
--- a/sys/boot/alpha/libalpha/libalpha.h
+++ b/sys/boot/alpha/libalpha/libalpha.h
@@ -74,9 +74,9 @@ extern struct netif_driver srmnet;
 extern void		delay(int);
 extern void		reboot(void);
 
-extern int		alpha_copyin(void *src, vm_offset_t dest, size_t len);
-extern int		alpha_copyout(vm_offset_t src, void *dest, size_t len);
-extern int		alpha_readin(int fd, vm_offset_t dest, size_t len);
+ssize_t	alpha_copyin(const void *src, vm_offset_t dest, const size_t len);
+ssize_t	alpha_copyout(const vm_offset_t src, void *dest, const size_t len);
+ssize_t	alpha_readin(const int fd, vm_offset_t dest, const size_t len);
 
 extern int		alpha_boot(void);
 extern int		alpha_autoload(void);
diff --git a/sys/boot/common/dev_net.c b/sys/boot/common/dev_net.c
index 619fff830d7..c88dae708d2 100644
--- a/sys/boot/common/dev_net.c
+++ b/sys/boot/common/dev_net.c
@@ -196,7 +196,6 @@ net_strategy()
  */
 #ifdef	SUPPORT_BOOTP
 int try_bootp = 1;
-int bootp(int sock);
 #endif
 
 extern n_long ip_convertaddr(char *p);
diff --git a/sys/boot/ofw/libofw/ofw_copy.c b/sys/boot/ofw/libofw/ofw_copy.c
index 95b6cba677e..12f56b1fcfd 100644
--- a/sys/boot/ofw/libofw/ofw_copy.c
+++ b/sys/boot/ofw/libofw/ofw_copy.c
@@ -34,22 +34,22 @@
 
 #include "libalpha.h"
 
-int
-alpha_copyin(void *src, vm_offset_t dest, size_t len)
+ssize_t
+alpha_copyin(const void *src, vm_offset_t dest, const size_t len)
 {
-    bcopy(src, dest, len);
+    bcopy(src, (void *)dest, len);
     return(len);
 }
 
-int
-alpha_copyout(vm_offset_t src, void *dest, size_t len)
+ssize_t
+alpha_copyout(const vm_offset_t src, void *dest, const size_t len)
 {
-    bcopy(src, dest, len);
+    bcopy((void *)src, dest, len);
     return(len);
 }
 
-int
-alpha_readin(int fd, vm_offset_t dest, size_t len)
+ssize_t
+alpha_readin(const int fd, vm_offset_t dest, const size_t len)
 {
     return(read(fd, (void *) dest, len));
 }