bcopy -> memcpy

7 files changed, 25 insertions, 25 deletions

diff --git a/xc/lib/Xi/XExtInt.c b/xc/lib/Xi/XExtInt.c
index 994ed8d3c..1b0c050b7 100644
--- a/xc/lib/Xi/XExtInt.c
+++ b/xc/lib/Xi/XExtInt.c
@@ -1,4 +1,4 @@
-/* $XConsortium: XExtInt.c,v 1.27 92/11/14 10:36:21 rws Exp $ */
+/* $XConsortium: XExtInt.c,v 1.28 93/08/19 09:08:59 rws Exp $ */
 
 /************************************************************
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, California, and the 
@@ -494,7 +494,7 @@ XInputWireToEvent (dpy, re, event)
 	        kstev->class = KeyClass;
 	        kstev->length = sizeof (XKeyStatus);
 	        kstev->num_keys = sev->num_keys;
-	        bcopy ((char *) &sev->keys[0], (char *) &kstev->keys[0], 4);
+	        memcpy ((char *) &kstev->keys[0], (char *) &sev->keys[0], 4);
 	        data += sizeof (XKeyStatus);
 	        }
 	    if (sev->classes_reported & (1 << ButtonClass))
@@ -503,7 +503,7 @@ XInputWireToEvent (dpy, re, event)
 	        bev->class = ButtonClass;
 	        bev->length = sizeof (XButtonStatus);
 	        bev->num_buttons = sev->num_buttons;
-	        bcopy ((char *) sev->buttons, (char *) bev->buttons, 4);
+	        memcpy ((char *) bev->buttons, (char *) sev->buttons, 4);
 	        data += sizeof (XButtonStatus);
 	        }
 	    if (sev->classes_reported & (1 << ValuatorClass))
@@ -552,7 +552,7 @@ XInputWireToEvent (dpy, re, event)
 	
 	    kv = (XKeyStatus *) anyclass;
 	    kv->num_keys = 256;
-	    bcopy ((char *) ksev->keys, (char *) &kv->keys[4], 28);
+	    memcpy ((char *) &kv->keys[4], (char *) ksev->keys, 28);
     	    if (ksev->deviceid & MORE_EVENTS)
 	        return (DONT_ENQUEUE);
 	    else
@@ -583,7 +583,7 @@ XInputWireToEvent (dpy, re, event)
 	
 	    bv = (XButtonStatus *) anyclass;
 	    bv->num_buttons = 256;
-	    bcopy ((char *) bsev->buttons, (char *) &bv->buttons[4], 28);
+	    memcpy ((char *) &bv->buttons[4], (char *) bsev->buttons, 28);
     	    if (bsev->deviceid & MORE_EVENTS)
 	        return (DONT_ENQUEUE);
 	    else
diff --git a/xc/lib/Xi/XExtToWire.c b/xc/lib/Xi/XExtToWire.c
index ee6ef2300..1b15ba517 100644
--- a/xc/lib/Xi/XExtToWire.c
+++ b/xc/lib/Xi/XExtToWire.c
@@ -1,4 +1,4 @@
-/* $XConsortium: XExtToWire.c,v 1.13 91/12/26 12:17:38 rws Exp $ */
+/* $XConsortium: XExtToWire.c,v 1.14 92/11/14 12:56:14 rws Exp $ */
 
 /************************************************************
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, California, and the 
@@ -332,7 +332,7 @@ XInputEventToWire(dpy, re, event, count)
 
 		    sev->classes_reported |= (1 << KeyClass);
 		    sev->num_keys = k->num_keys;
-		    bcopy ( (char *) (k->keys) , (char *) (sev->keys), 4);
+		    memcpy ((char *) (sev->keys), (char *) (k->keys), 4);
 		    if (k->num_keys > 32)
 			{
 		        kev = (deviceKeyStateNotify *) tev++;
@@ -341,7 +341,7 @@ XInputEventToWire(dpy, re, event, count)
 		        kev->deviceid = ev->deviceid;
 		        *sav_id |= MORE_EVENTS;
 			sav_id = &(kev->deviceid);
-			bcopy ( (char *) (&k->keys[4]) , (char *) (kev->keys), 
+			memcpy ((char *) (kev->keys), (char *) (&k->keys[4]),
 				28);
 			}
 		    }
@@ -352,7 +352,7 @@ XInputEventToWire(dpy, re, event, count)
 
 		    sev->classes_reported |= (1 << ButtonClass);
 		    sev->num_buttons = b->num_buttons;
-		    bcopy ( (char *) (b->buttons) , (char *) (sev->buttons), 4);
+		    memcpy ((char *) (sev->buttons), (char *) (b->buttons), 4);
 		    if (b->num_buttons > 32)
 			{
 		        bev = (deviceButtonStateNotify *) tev++;
@@ -361,7 +361,7 @@ XInputEventToWire(dpy, re, event, count)
 		        bev->deviceid = ev->deviceid;
 		        *sav_id |= MORE_EVENTS;
 			sav_id = &(bev->deviceid);
-			bcopy ((char *)(&b->buttons[4]), (char *)(bev->buttons),
+			memcpy ((char *)(bev->buttons), (char *)(&b->buttons[4]),
 				28);
 			}
 		    }
diff --git a/xc/lib/Xi/XGetBMap.c b/xc/lib/Xi/XGetBMap.c
index 61902a97c..5ba1305d5 100644
--- a/xc/lib/Xi/XGetBMap.c
+++ b/xc/lib/Xi/XGetBMap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: XGetBMap.c,v 1.3 89/09/25 16:20:21 gms Exp $ */
+/* $XConsortium: XGetBMap.c,v 1.4 89/12/06 20:38:18 rws Exp $ */
 
 /************************************************************
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, California, and the 
@@ -72,7 +72,7 @@ XGetDeviceButtonMapping (dpy, device, map, nmap)
 
 	/* don't return more data than the user asked for. */
 	if (rep.nElts) 
-	    bcopy ((char *) mapping, (char *) map, MIN ((int)rep.nElts, nmap) );
+	    memcpy ((char *) map, (char *) mapping, MIN((int)rep.nElts, nmap));
 	status = rep.nElts;
 	}
     else
diff --git a/xc/lib/Xi/XGetFCtl.c b/xc/lib/Xi/XGetFCtl.c
index 1e9140fd9..d386a1765 100644
--- a/xc/lib/Xi/XGetFCtl.c
+++ b/xc/lib/Xi/XGetFCtl.c
@@ -1,4 +1,4 @@
-/* $XConsortium: XGetFCtl.c,v 1.11 91/01/26 13:34:42 rws Exp $ */
+/* $XConsortium: XGetFCtl.c,v 1.12 92/11/14 12:55:09 rws Exp $ */
 
 /************************************************************
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, California, and the 
@@ -147,8 +147,8 @@ XFeedbackState
 		    K->duration = k->duration;
 		    K->led_mask = k->led_mask;
 		    K->global_auto_repeat = k->global_auto_repeat;
-		    bcopy ((char *) &k->auto_repeats[0], 
-			(char *) &K->auto_repeats[0], 32);
+		    memcpy ((char *) &K->auto_repeats[0],
+			    (char *) &k->auto_repeats[0], 32);
 		    break;
 		    }
 		case PtrFeedbackClass:
@@ -195,8 +195,8 @@ XFeedbackState
 		    S->max_symbols = s->max_symbols;
 		    S->num_syms_supported = s->num_syms_supported;
 		    S->syms_supported = (KeySym *) (S+1);
-		    bcopy ((char *) (s+1), (char *) S->syms_supported,
-			(S->num_syms_supported * sizeof (KeySym)));
+		    memcpy ((char *) S->syms_supported, (char *) (s+1),
+			    (S->num_syms_supported * sizeof (KeySym)));
 		    break;
 		    }
 		case LedFeedbackClass:
diff --git a/xc/lib/Xi/XListDev.c b/xc/lib/Xi/XListDev.c
index 6314e2063..8be8fbff7 100644
--- a/xc/lib/Xi/XListDev.c
+++ b/xc/lib/Xi/XListDev.c
@@ -1,4 +1,4 @@
-/* $XConsortium: XListDev.c,v 1.19 93/02/05 17:03:43 rws Exp $ */
+/* $XConsortium: XListDev.c,v 1.20 93/08/24 09:28:01 rws Exp $ */
 
 /************************************************************
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, California, and the 
@@ -206,7 +206,7 @@ XDeviceInfo
 	for (i=0; i<*ndevices; i++,clist++) 
 	    {
 	    clist->name = (char *) Nptr;
-	    bcopy ( nptr+1, Nptr, *nptr);
+	    memcpy (Nptr,  nptr+1, *nptr);
 	    Nptr += (*nptr);
 	    *Nptr++ = '\0';
 	    nptr += (*nptr + 1);
diff --git a/xc/lib/Xi/XQueryDv.c b/xc/lib/Xi/XQueryDv.c
index c381e7ef9..a8cd987d2 100644
--- a/xc/lib/Xi/XQueryDv.c
+++ b/xc/lib/Xi/XQueryDv.c
@@ -1,4 +1,4 @@
-/* $XConsortium: XQueryDv.c,v 1.10 91/02/09 17:53:04 rws Exp $ */
+/* $XConsortium: XQueryDv.c,v 1.11 92/11/14 12:55:23 rws Exp $ */
 
 /************************************************************
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, California, and the 
@@ -123,7 +123,7 @@ XDeviceState
 		    K->class = k->class;
 		    K->length = sizeof (XKeyState);
 		    K->num_keys = k->num_keys;
-		    bcopy ((char *) &k->keys[0], (char *) &K->keys[0], 32);
+		    memcpy ((char *) &K->keys[0], (char *) &k->keys[0], 32);
 		    Any = (XInputClass *) (K+1);
 		    }
 		    break;
@@ -134,8 +134,8 @@ XDeviceState
 		    B->class = b->class;
 		    B->length = sizeof (XButtonState);
 		    B->num_buttons = b->num_buttons;
-		    bcopy ((char *) &b->buttons[0], (char *) &B->buttons[0], 
-			32);
+		    memcpy ((char *) &B->buttons[0], (char *) &b->buttons[0],
+			    32);
 		    Any = (XInputClass *) (B+1);
 		    }
 		    break;
diff --git a/xc/lib/Xi/XSetMMap.c b/xc/lib/Xi/XSetMMap.c
index b167c1363..94f8c08ec 100644
--- a/xc/lib/Xi/XSetMMap.c
+++ b/xc/lib/Xi/XSetMMap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: XSetMMap.c,v 1.4 89/12/06 20:38:53 rws Exp $ */
+/* $XConsortium: XSetMMap.c,v 1.5 93/01/28 19:40:44 rws Exp $ */
 
 /************************************************************
 Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, California, and the 
@@ -56,7 +56,7 @@ XSetDeviceModifierMapping (dpy, dev, modmap)
     req->ReqType = X_SetDeviceModifierMapping;
     req->deviceid = dev->device_id;
     req->numKeyPerModifier = modmap->max_keypermod;
-    bcopy(modmap->modifiermap, (char *)&req[1], mapSize);
+    memcpy((char *)&req[1], modmap->modifiermap, mapSize);
 
     (void) _XReply(dpy, (xReply *) &rep,
 	(sizeof(xSetDeviceModifierMappingReply) - sizeof(xReply)) >> 2, xTrue);