bcopy -> memmove

4 files changed, 7 insertions, 20 deletions

diff --git a/src/FSOpenServ.c b/src/FSOpenServ.c
index d547fa4..342ed80 100644
--- a/src/FSOpenServ.c
+++ b/src/FSOpenServ.c
@@ -1,6 +1,4 @@
-/* $Xorg: FSOpenServ.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
-
-/* @(#)FSOpenServ.c	4.1	91/05/02
+/*
  * Copyright 1990 Network Computing Devices;
  * Portions Copyright 1987 by Digital Equipment Corporation
  *
@@ -24,7 +22,6 @@
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS 
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/FS/FSOpenServ.c,v 1.8tsi Exp $ */
 
 /*
 
@@ -195,7 +192,7 @@ FSOpenServer(char *server)
 	    errno = ENOMEM;
 	    return (FSServer *) 0;
 	}
-	bcopy(ad, alts[i].name, altlen);
+	memmove(alts[i].name, ad, altlen);
 	alts[i].name[altlen] = '\0';
 	ad += altlen + ((4 - (altlen + 2)) & 3);
     }
diff --git a/src/FSlibInt.c b/src/FSlibInt.c
index ac0b26c..f947104 100644
--- a/src/FSlibInt.c
+++ b/src/FSlibInt.c
@@ -1,5 +1,3 @@
-/* $Xorg: FSlibInt.c,v 1.5 2001/02/09 02:03:25 xorgcvs Exp $ */
-
 /*
  * Copyright 1990 Network Computing Devices;
  * Portions Copyright 1987 by Digital Equipment Corporation
@@ -50,7 +48,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/FS/FSlibInt.c,v 3.10tsi Exp $ */
 
 /*
  *	FSlibInt.c - Internal support routines for the C subroutine
@@ -1120,7 +1117,7 @@ Data(
     long	 len)
 {
     if (svr->bufptr + (len) <= svr->bufmax) {
-	bcopy(data, svr->bufptr, (int) len);
+	memmove(svr->bufptr, data, len);
 	svr->bufptr += ((len) + 3) & ~3;
     } else {
 	_FSSend(svr, data, len);
diff --git a/src/FSlibint.h b/src/FSlibint.h
index f042d2a..d25eb30 100644
--- a/src/FSlibint.h
+++ b/src/FSlibint.h
@@ -1,5 +1,3 @@
-/* $Xorg: FSlibint.h,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
-
 /*
  * Copyright 1990 Network Computing Devices;
  * Portions Copyright 1987 by Digital Equipment Corporation
@@ -50,7 +48,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/FS/FSlibint.h,v 3.8 2003/08/29 18:01:12 herrb Exp $ */
 
 /*
  * FSlib internal decls
@@ -285,7 +282,7 @@ extern void Data();
 #else
 #define Data(svr, data, len) \
 	if (svr->bufptr + (len) <= svr->bufmax) {\
-		bcopy(data, svr->bufptr, (int)len);\
+		memmove(svr->bufptr, data, len);\
 		svr->bufptr += ((len) + 3) & ~3;\
 	} else\
 		_FSSend(svr, data, len)
@@ -337,7 +334,7 @@ extern void Data();
 #define STARTITERATE(tpvar,type,start,endcond,decr) \
   { register char *cpvar; \
   for (cpvar = (char *) start; endcond; cpvar = NEXTPTR(cpvar,type), decr) { \
-    type dummy; bcopy (cpvar, (char *) &dummy, SIZEOF(type)); \
+    type dummy; memmove ((char *) &dummy, cpvar, SIZEOF(type)); \
     tpvar = (type *) cpvar;
 #define ENDITERATE }}
 
diff --git a/src/FSlibos.h b/src/FSlibos.h
index 0ee4502..1e41e75 100644
--- a/src/FSlibos.h
+++ b/src/FSlibos.h
@@ -1,7 +1,4 @@
-/* $XdotOrg: xc/lib/FS/FSlibos.h,v 1.3 2005/06/09 15:52:02 ago Exp $ */
-/* $Xorg: FSlibos.h,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
-
-/* @(#)FSlibos.h	4.1	91/05/02
+/*
  * Copyright 1990 Network Computing Devices;
  * Portions Copyright 1987 by Digital Equipment Corporation
  *
@@ -51,7 +48,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/FS/FSlibos.h,v 3.10 2003/09/01 20:50:10 herrb Exp $ */
 
 /*
  * FSlib networking & os include file
@@ -228,7 +224,7 @@ typedef unsigned long FdSet[MSKCNT];
 #endif
 
 #if (MSKCNT>4)
-#define COPYBITS(src, dst) bcopy((caddr_t) src, (caddr_t) dst, sizeof(FdSet))
+#define COPYBITS(src, dst) memmove((caddr_t) dst, (caddr_t) src, sizeof(FdSet))
 #define CLEARBITS(buf) bzero((caddr_t) buf, sizeof(FdSet))
 #define MASKANDSETBITS(dst, b1, b2)  \
 		      { int cri;			\