purge wbcopy, replace with memcpy

sed -e "s|wbcopy[ ]*(\(.*\),[ ]*\(.*\),[ ]*\(.*\))|memcpy(\2, \1, \3)|"

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

15 files changed, 49 insertions, 73 deletions

diff --git a/xts5/Xproto/pPutImage.m b/xts5/Xproto/pPutImage.m
index ed251e0b..ff3a62dc 100644
--- a/xts5/Xproto/pPutImage.m
+++ b/xts5/Xproto/pPutImage.m
@@ -203,7 +203,7 @@ tester()
 			}
 			to = (unsigned char *) (pir+1);
 			from = (unsigned char *) (rep+1);
-			wbcopy(from, to, rep->length << 2);
+			memcpy(to, from, rep->length << 2);
 		}
 	}
 
diff --git a/xts5/src/libproto/DataMove.c b/xts5/src/libproto/DataMove.c
index 64f68a9d..defaf560 100644
--- a/xts5/src/libproto/DataMove.c
+++ b/xts5/src/libproto/DataMove.c
@@ -275,7 +275,7 @@ char *from;
 int len;
 
 	len = strlen(from);
-	wbcopy (from, *to, len);
+	memcpy(*to, from, len);
 	(*to) += len;
 }
 
@@ -288,7 +288,7 @@ char *from;
     int len;
 
     len = strlen(from);
-    wbcopy (from, *to, len);
+    memcpy(*to, from, len);
     (*to) += padup(len);
 }
 
diff --git a/xts5/src/libproto/RcvEvt.c b/xts5/src/libproto/RcvEvt.c
index 7cd83e6f..d8c42c22 100644
--- a/xts5/src/libproto/RcvEvt.c
+++ b/xts5/src/libproto/RcvEvt.c
@@ -263,7 +263,7 @@ int client;
 		break;
 	case KeymapNotify:
 		rbp = rbuf + 1;
-		wbcopy(rbp,(unsigned char *) (((xKeymapEvent *)rp)->map),31);
+		memcpy((unsigned char *) (((xKeymapEvent *)rp)->map), rbp, 31);
 		break;
 	case Expose:
 		rp->u.expose.window = unpack4(&rbp,needswap);
diff --git a/xts5/src/libproto/RcvExtRep.c b/xts5/src/libproto/RcvExtRep.c
index 74c1e171..6718cfc7 100644
--- a/xts5/src/libproto/RcvExtRep.c
+++ b/xts5/src/libproto/RcvExtRep.c
@@ -214,7 +214,7 @@ int client;   /* */
 		    Length_Error(max(bytes_there,calculated_length<<2),client,rp,type,"ListInputDevices",calculated_length);
 		    break;
 		}
-		wbcopy(rbuf + 32, valuePtr, calculated_length << 2);
+		memcpy(valuePtr, rbuf + 32, calculated_length << 2);
 		break;
 		}
 	case X_OpenDevice:
@@ -351,7 +351,7 @@ int client;   /* */
 		    break;
 		}
 		rbp += 23;
-		wbcopy(rbp,valuePtr,((xGetDeviceButtonMappingReply *)rp)->nElts);
+		memcpy(valuePtr, rbp, ((xGetDeviceButtonMappingReply *)rp)->nElts);
 		break;
 	case X_SetDeviceButtonMapping:
 		((xSetDeviceButtonMappingReply *)rp)->status = unpack1(&rbp);
@@ -369,7 +369,7 @@ int client;   /* */
 		}
 		*/
 		rbp += 23;
-		wbcopy(rbp,valuePtr,((xGetDeviceButtonMappingReply *)rp)->nElts);
+		memcpy(valuePtr, rbp, ((xGetDeviceButtonMappingReply *)rp)->nElts);
 		break;
 	case X_SetDeviceValuators:
 		((xSetDeviceValuatorsReply *)rp)->status = unpack1(&rbp);
diff --git a/xts5/src/libproto/RcvRep.c b/xts5/src/libproto/RcvRep.c
index fca22653..c4951846 100644
--- a/xts5/src/libproto/RcvRep.c
+++ b/xts5/src/libproto/RcvRep.c
@@ -236,7 +236,7 @@ int client;   /* */
 		    break;
 		}
 		rbp += 22;
-		wbcopy(rbp,valuePtr,((xGetAtomNameReply *)rp)->nameLength);
+		memcpy(valuePtr, rbp, ((xGetAtomNameReply *)rp)->nameLength);
 		break;
 	case X_GetProperty:
 		((xGetPropertyReply *)rp)->type = unpack4(&rbp,needswap);
@@ -257,7 +257,7 @@ int client;   /* */
 			Length_Error(max(bytes_there,calculated_length<<2),client,rp,type,"GetProperty",calculated_length);
 			break;
 		    }
-		    wbcopy(rbp,valuePtr,nitems);
+		    memcpy(valuePtr, rbp, nitems);
 		    break;
 		case FORMAT16:
 		    calculated_length = (nitems + 1) >> 1;
@@ -371,7 +371,7 @@ int client;   /* */
 		}
 		valuePtr = (unsigned char *) ((unsigned char *) rp +
 		    (rbp - rbuf));
-		wbcopy(rbp,valuePtr, 32);
+		memcpy(valuePtr, rbp, 32);
 		break;
 	case X_QueryFont:
 		valuePtr =  (unsigned char *) &(((xQueryFontReply *)rp)->minBounds);
@@ -435,7 +435,7 @@ int client;   /* */
 			Finish(client);
 		    }
 		    *valuePtr++ = *rbp++;
-		    wbcopy(rbp,valuePtr,nlen);
+		    memcpy(valuePtr, rbp, nlen);
 		    rbp += nlen;
 		    valuePtr += nlen;
 		}
@@ -474,7 +474,7 @@ int client;   /* */
 		Unpack_Longs((unsigned long *) valuePtr, &rbp, 
 		    (((xListFontsWithInfoReply *)rp)->nFontProps) * 2,needswap);
 		valuePtr += (((xListFontsWithInfoReply *)rp)->nFontProps * 2 * 4);
-		wbcopy(rbp,valuePtr,((xListFontsWithInfoReply *)rp)->nameLength);
+		memcpy(valuePtr, rbp, ((xListFontsWithInfoReply *)rp)->nameLength);
 		Show_Rep(rp,X_ListFontsWithInfo,bytes_there);
 		break;
 	case X_GetFontPath:
@@ -494,7 +494,7 @@ int client;   /* */
 			Finish(client);
 		    }
 		    *valuePtr++ = *rbp++;
-		    wbcopy(rbp,valuePtr,nlen);
+		    memcpy(valuePtr, rbp, nlen);
 		    rbp += nlen;
 		    valuePtr += nlen;
 		}
@@ -680,7 +680,7 @@ int client;   /* */
 		    Length_Error(max(bytes_there,calculated_length<<2),client,rp,type,"ListExtensions",calculated_length);
 		    break;
 		}
-		wbcopy(rbuf + 32, valuePtr, calculated_length << 2);
+		memcpy(valuePtr, rbuf + 32, calculated_length << 2);
 		break;
 	    }
 	case X_GetKeyboardMapping:
@@ -704,7 +704,7 @@ int client;   /* */
 		rbp += 2;
 		valuePtr = (unsigned char *) ((unsigned char *) rp +
 		    (rbp - rbuf));
-		wbcopy(rbp,valuePtr,32);
+		memcpy(valuePtr, rbp, 32);
 		break;
 	case X_GetPointerControl:
 		if (rp->generic.length != 0) {
@@ -764,7 +764,7 @@ int client;   /* */
 					calculated_length);
 				break;
 			}
-			wbcopy(rbp,valuePtr,hlen);
+			memcpy(valuePtr, rbp, hlen);
 			rbp += padup((int)hlen);
 			valuePtr += padup((int)hlen);
 		    }
@@ -788,7 +788,7 @@ int client;   /* */
 		    break;
 		}
 		rbp += 24;
-		wbcopy(rbp,valuePtr,rp->generic.data1);
+		memcpy(valuePtr, rbp, rp->generic.data1);
 		break;
 	case X_SetModifierMapping:
 		if (rp->generic.length != 0) {
diff --git a/xts5/src/libproto/SendSup.c b/xts5/src/libproto/SendSup.c
index 5e2241f4..3471f772 100644
--- a/xts5/src/libproto/SendSup.c
+++ b/xts5/src/libproto/SendSup.c
@@ -215,7 +215,7 @@ int format;
 	else
 		{
 	    squeeze_me_in(cl, (unsigned long)valueLen);
-	    wbcopy(valuePtr,Get_Display(cl)->bufptr,valueLen);
+	    memcpy(Get_Display(cl)->bufptr, valuePtr, valueLen);
 		}
 	Get_Display(cl)->bufptr += valueLen;
 	}
@@ -269,7 +269,7 @@ int size;
     if(valueLen < 1)
         return;
     squeeze_me_in(cl, (unsigned long)valueLen);
-    wbcopy((char *)valuePtr,Get_Display(cl)->bufptr,valueLen);
+    memcpy(Get_Display(cl)->bufptr, (char *)valuePtr, valueLen);
     Get_Display(cl)->bufptr += valueLen;
 }
 
@@ -328,7 +328,7 @@ int size;
     if(valueLen < 1)
         return;
     squeeze_me_in(cl, (unsigned long)valueLen);
-    wbcopy((char *)valuePtr,Get_Display(cl)->bufptr,valueLen);
+    memcpy(Get_Display(cl)->bufptr, (char *)valuePtr, valueLen);
     Get_Display(cl)->bufptr += valueLen;
 }
 
diff --git a/xts5/src/libproto/ShowEvt.c b/xts5/src/libproto/ShowEvt.c
index 10a0f079..d6d9ce75 100644
--- a/xts5/src/libproto/ShowEvt.c
+++ b/xts5/src/libproto/ShowEvt.c
@@ -138,7 +138,7 @@ xEvent *mmp;
 {
 	xEvent *mp = (xEvent *)Xstmalloc((unsigned)sizeof(xEvent));
 
-	wbcopy((char *)mmp, (char *)mp, (unsigned)sizeof(xEvent));
+	memcpy((char *)mp, (char *)mmp, (unsigned)sizeof(xEvent));
 	/* always ensure we've got enough room */
 
 	if ((int)real_type(mp->u.u.type) > FirstExtensionEvent) {
diff --git a/xts5/src/libproto/ShowRep.c b/xts5/src/libproto/ShowRep.c
index b3a8059d..2e5878d8 100644
--- a/xts5/src/libproto/ShowRep.c
+++ b/xts5/src/libproto/ShowRep.c
@@ -149,7 +149,7 @@ long bytes_given;
 		unsigned int cpyd = min(rep_says, bytes_needed);
 
 		mp = (xReply *)Xstmalloc(reqd);
-		wbcopy((char *)mmp, (char *)mp, cpyd);
+		memcpy((char *)mp, (char *)mmp, cpyd);
 		bytes_needed = cpyd;
 		free_it = True;
 	} else
@@ -579,7 +579,7 @@ long bytes_given;
 			BPRINTF2("length = %d\t",hp->length);
 			valuePtr += sizeof(xHostEntry);
 			hostname = 0x0;
-			wbcopy(valuePtr, (char *)&hostname,
+			memcpy(&hostname, valuePtr,
 				min(sizeof(unsigned long),hp->length));
 			BPRINTF2("\tFirst 4 bytes: 0x%08x\n",hostname);
 			valuePtr += padup((int)hp->length);
diff --git a/xts5/src/libproto/ShowSup.c b/xts5/src/libproto/ShowSup.c
index a05ff7d0..01941220 100644
--- a/xts5/src/libproto/ShowSup.c
+++ b/xts5/src/libproto/ShowSup.c
@@ -542,7 +542,7 @@ char *label;
 	Reset_Some();
     for(i = 0; i < nstrs; i++) {
 	len = *cp;
-	wbcopy (cp + 1, scratchbuf, len);
+	memcpy(scratchbuf, cp + 1, len);
 	scratchbuf[len] = '\0';
 	Log_Some( "\t%s[%d] = \"%s\"\n", label, i, scratchbuf);
 	cp += len + 1;
diff --git a/xts5/src/libproto/Utils.c b/xts5/src/libproto/Utils.c
index 7c4057ca..359b6823 100644
--- a/xts5/src/libproto/Utils.c
+++ b/xts5/src/libproto/Utils.c
@@ -162,30 +162,6 @@ Get_Date()
 	return(buf);
 }
 
-
-/*
- * These are routines found in BSD and not found in SYSV.
- */
-
-void
-wbcopy (b1, b2, length)
-register unsigned char *b1, *b2;
-register length;
-{
-    if (b1 < b2) {
-	b2 += length;
-	b1 += length;
-	while (length--) {
-	    *--b2 = *--b1;
-	}
-    }
-    else {
-	while (length--) {
-	    *b2++ = *b1++;
-	}
-    }
-}
-
 wbcmp (b1, b2, length)
 register unsigned char *b1, *b2;
 register length;
diff --git a/xts5/src/libproto/ValListMng.c b/xts5/src/libproto/ValListMng.c
index d4b7e2f0..4c6d4779 100644
--- a/xts5/src/libproto/ValListMng.c
+++ b/xts5/src/libproto/ValListMng.c
@@ -342,7 +342,7 @@ unsigned long value;
 
 	valuePtr = (CARD32 *) (((char *) reqp) + nominal_size);
 	valuePtr += before;		/* index down to this position */
-	wbcopy((char *)valuePtr,(char *)(valuePtr+1),(after<<2));
+	memcpy((char *)(valuePtr+1), (char *)valuePtr, (after<<2));
     }
 
     valuePtr = (CARD32 *) (((char *) reqp) + nominal_size);
@@ -474,7 +474,7 @@ unsigned long mask;
 
     valuePtr = (CARD32 *) (((char *) reqp) + nominal_size);
     valuePtr += before;		/* index down to this position */
-    wbcopy((char *)(valuePtr+1),(char *)valuePtr,(after<<2));
+    memcpy((char *)valuePtr, (char *)(valuePtr+1), (after<<2));
     reqp = (xReq *) Xstrealloc((char *)reqp,reqp->length<<2);
     return(reqp);
 }
@@ -1161,7 +1161,7 @@ Add_Counted_Bytes (reqp, bytep, nbytes)
 
 	    reqp->length += (padup(nbytes))/4;
 	    valuePtr = (unsigned char *) (((char *) reqp) + nominal_size);
-	    wbcopy(bytep, valuePtr, nbytes);
+	    memcpy(valuePtr, bytep, nbytes);
 	    break;
 	default: 
 	    DEFAULT_ERROR;
diff --git a/xts5/src/libproto/XlibNoXtst.c b/xts5/src/libproto/XlibNoXtst.c
index a5314a08..f7b050e0 100644
--- a/xts5/src/libproto/XlibNoXtst.c
+++ b/xts5/src/libproto/XlibNoXtst.c
@@ -361,8 +361,8 @@ int XstConnectDisplay (display_name, expanded_name, screen_num,
  
 			/* Set up the socket data. */
 			inaddr.sin_family = host_ptr->h_addrtype;
-			wbcopy((char *)host_ptr->h_addr, 
-			      (char *)&inaddr.sin_addr, 
+			memcpy((char *)&inaddr.sin_addr,
+			       (char *)host_ptr->h_addr,
 			      sizeof(inaddr.sin_addr));
 		} else {
 			inaddr.sin_family = AF_INET;
@@ -480,7 +480,7 @@ XstSendClientPrefix (dpy, client, auth_proto, auth_string, needswap)
                        auth_length + padlength[auth_length & 3] +
                        auth_strlen + padlength[auth_strlen & 3]);
 
-	/* wbcopy(client, buffer, sizeof(xConnClientPrefix)); */
+	/* memcpy(buffer, client, sizeof(xConnClientPrefix)); */
 	bptr = buffer;
 	BPRINTF1 ("OpenDisplay message:\n");
 	pack1(&bptr,client->byteOrder);
@@ -502,11 +502,11 @@ XstSendClientPrefix (dpy, client, auth_proto, auth_string, needswap)
 	BPRINTF2 ("\tAuthProtoName = %d bytes\n", auth_length);
         if (auth_length)
 	{
-	    wbcopy(auth_proto, bptr, auth_length);
+	    memcpy(bptr, auth_proto, auth_length);
             bptr += auth_length;
             if (padlength[auth_length & 3])
 	    {
-		wbcopy(pad, bptr, padlength[auth_length & 3]);
+		memcpy(bptr, pad, padlength[auth_length & 3]);
 	        bptr += padlength[auth_length & 3];
 		BPRINTF2 ("\tAuthProtoName pad = %d bytes\n", padlength[auth_length & 3]);
 	    }
@@ -514,11 +514,11 @@ XstSendClientPrefix (dpy, client, auth_proto, auth_string, needswap)
 	BPRINTF2 ("\tAuthProtoData = %d bytes\n", auth_strlen);
         if (auth_strlen)
 	{
-	    wbcopy(auth_string, bptr, auth_strlen);
+	    memcpy(bptr, auth_string, auth_strlen);
             bptr += auth_strlen;
             if (padlength[auth_strlen & 3])
 	    {
-		wbcopy(pad, bptr, padlength[auth_strlen & 3]);
+		memcpy(bptr, pad, padlength[auth_strlen & 3]);
 	        bptr += padlength[auth_strlen & 3];
 		BPRINTF2 ("\tAuthProtoData pad = %d bytes\n", padlength[auth_strlen & 3]);
 	    }
@@ -710,7 +710,7 @@ int     needswap;
 	sptr = (char *) (setupdp + 1);
 
 /*	get the vendor string */
-	wbcopy (bptr, sptr, setupdp -> nbytesVendor);
+	memcpy(sptr, bptr, setupdp -> nbytesVendor);
 	pad = (setupdp -> nbytesVendor + 3) & ~3;
 	bptr += pad;
 	sptr += pad;
@@ -718,7 +718,7 @@ int     needswap;
  /* Z axis screen format info */
  /* NOTE - this counts on only 1 byte quantities in the format!! */
 	for (f = 0; f < setupdp->numFormats; f++) {
-	wbcopy (bptr, sptr, sizeof (xPixmapFormat));
+	memcpy(sptr, bptr, sizeof (xPixmapFormat));
 	bptr += sizeof (xPixmapFormat);
 	sptr += sizeof (xPixmapFormat);
 	}
@@ -737,7 +737,7 @@ int     needswap;
 	swapcplp (bptr, sptr);	/* visualID */
 	bptr += 4;
 	sptr += 4;
-	wbcopy (bptr, sptr, 4);
+	memcpy(sptr, bptr, 4);
 	ndepths = bptr[3];	/* pull out nDepths */
 	bptr += 4;
 	sptr += 4;
diff --git a/xts5/src/libproto/XlibOpaque.c b/xts5/src/libproto/XlibOpaque.c
index b20b9b11..717ac698 100644
--- a/xts5/src/libproto/XlibOpaque.c
+++ b/xts5/src/libproto/XlibOpaque.c
@@ -379,7 +379,7 @@ int     needswap;
 	sptr = (char *) (setupdp + 1);
 
 /*	get the vendor string */
-	wbcopy (ServerVendor(xdpy), sptr, setupdp -> nbytesVendor);
+	memcpy(sptr, ServerVendor(xdpy), setupdp -> nbytesVendor);
 	pad = (setupdp -> nbytesVendor + 3) & ~3;
 	sptr += pad;
 
diff --git a/xts5/src/libproto/XlibXtst.c b/xts5/src/libproto/XlibXtst.c
index d625c786..f9906a93 100644
--- a/xts5/src/libproto/XlibXtst.c
+++ b/xts5/src/libproto/XlibXtst.c
@@ -320,7 +320,7 @@ void XstSendClientPrefix (dpy, client, auth_proto, auth_string, needswap)
                        auth_length + padlength[auth_length & 3] +
                        auth_strlen + padlength[auth_strlen & 3]);
 
-	/* wbcopy(client, buffer, sizeof(xConnClientPrefix)); */
+	/* memcpy(buffer, client, sizeof(xConnClientPrefix)); */
 	bptr = buffer;
 	BPRINTF1 ("OpenDisplay message:\n");
 	pack1(&bptr,client->byteOrder);
@@ -342,11 +342,11 @@ void XstSendClientPrefix (dpy, client, auth_proto, auth_string, needswap)
 	BPRINTF2 ("\tAuthProtoName = %d bytes\n", auth_length);
         if (auth_length)
 	{
-	    wbcopy(auth_proto, bptr, auth_length);
+	    memcpy(bptr, auth_proto, auth_length);
             bptr += auth_length;
             if (padlength[auth_length & 3])
 	    {
-		wbcopy(pad, bptr, padlength[auth_length & 3]);
+		memcpy(bptr, pad, padlength[auth_length & 3]);
 	        bptr += padlength[auth_length & 3];
 		BPRINTF2 ("\tAuthProtoName pad = %d bytes\n", padlength[auth_length & 3]);
 	    }
@@ -354,11 +354,11 @@ void XstSendClientPrefix (dpy, client, auth_proto, auth_string, needswap)
 	BPRINTF2 ("\tAuthProtoData = %d bytes\n", auth_strlen);
         if (auth_strlen)
 	{
-	    wbcopy(auth_string, bptr, auth_strlen);
+	    memcpy(bptr, auth_string, auth_strlen);
             bptr += auth_strlen;
             if (padlength[auth_strlen & 3])
 	    {
-		wbcopy(pad, bptr, padlength[auth_strlen & 3]);
+		memcpy(bptr, pad, padlength[auth_strlen & 3]);
 	        bptr += padlength[auth_strlen & 3];
 		BPRINTF2 ("\tAuthProtoData pad = %d bytes\n", padlength[auth_strlen & 3]);
 	    }
@@ -551,7 +551,7 @@ int     needswap;
 	sptr = (char *) (setupdp + 1);
 
 /*	get the vendor string */
-	wbcopy (bptr, sptr, setupdp -> nbytesVendor);
+	memcpy(sptr, bptr, setupdp -> nbytesVendor);
 	pad = (setupdp -> nbytesVendor + 3) & ~3;
 	bptr += pad;
 	sptr += pad;
@@ -559,7 +559,7 @@ int     needswap;
  /* Z axis screen format info */
  /* NOTE - this counts on only 1 byte quantities in the format!! */
 	for (f = 0; f < (int)setupdp->numFormats; f++) {
-	wbcopy (bptr, sptr, sizeof (xPixmapFormat));
+	memcpy(sptr, bptr, sizeof (xPixmapFormat));
 	bptr += sizeof (xPixmapFormat);
 	sptr += sizeof (xPixmapFormat);
 	}
@@ -578,7 +578,7 @@ int     needswap;
 	swapcplp (bptr, sptr);	/* visualID */
 	bptr += 4;
 	sptr += 4;
-	wbcopy (bptr, sptr, 4);
+	memcpy(sptr, bptr, 4);
 	ndepths = bptr[3];	/* pull out nDepths */
 	bptr += 4;
 	sptr += 4;
@@ -695,11 +695,11 @@ int     needswap;
     packpad(&bptr,sizeof(queryreq.pad2));
     BPRINTF2 ("\tpad2 = %d\n", (int) *(bptr-1));
     BPRINTF2 ("\tQueryName = %d bytes\n", queryreq.length);
-    wbcopy(query_name, bptr, query_len);
+    memcpy(bptr, query_name, query_len);
             bptr += query_len;
             if (padlength[query_len & 3])
 	    {
-		wbcopy(pad, bptr, padlength[query_len & 3]);
+		memcpy(bptr, pad, padlength[query_len & 3]);
 	        bptr += padlength[query_len & 3];
 		BPRINTF2 ("\tQueryName pad = %d bytes\n", padlength[query_len & 3]);
 	    }
diff --git a/xts5/src/libproto/tpstartup.c b/xts5/src/libproto/tpstartup.c
index 7fd6f92e..d7a06529 100644
--- a/xts5/src/libproto/tpstartup.c
+++ b/xts5/src/libproto/tpstartup.c
@@ -203,7 +203,7 @@ xGetFontPathReply *rep;
 		    npaths--) {
 		CARD8 len = *fromptr;
 
-		wbcopy(fromptr+1, toptr, (unsigned int)len);
+		memcpy(toptr, fromptr+1, (unsigned int)len);
 		fromptr += len + 1;
 		toptr += len;
 		*toptr++ = ',';