From: Mark Eichin <eichin@mit.edu>
Date: Wed, 15 Jun 1994 21:49:52 +0000 (+0000)
Subject: step 3: bcopy->memcpy or memmove (chose by hand), twiddle args
X-Git-Tag: krb5-1.0-beta4~43
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ff6202c01f23d233570623e1e093a7c29379fa75;p=krb5.git

step 3: bcopy->memcpy or memmove (chose by hand), twiddle args

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3812 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/appl/bsd/krlogin.c b/src/appl/bsd/krlogin.c
index 5ebb581de..581e0b8e3 100644
--- a/src/appl/bsd/krlogin.c
+++ b/src/appl/bsd/krlogin.c
@@ -1379,12 +1379,12 @@ int des_read(fd, buf, len)
       return(read(fd, buf, len));
     
     if (nstored >= len) {
-	bcopy(store_ptr, buf, len);
+	memcpy(buf, store_ptr, len);
 	store_ptr += len;
 	nstored -= len;
 	return(len);
     } else if (nstored) {
-	bcopy(store_ptr, buf, nstored);
+	memcpy(buf, store_ptr, nstored);
 	nreturned += nstored;
 	buf += nstored;
 	len -= nstored;
@@ -1435,12 +1435,12 @@ int des_read(fd, buf, len)
       store_ptr = storage;
     nstored = net_len;
     if (nstored > len) {
-	bcopy(store_ptr, buf, len);
+	memcpy(buf, store_ptr, len);
 	nreturned += len;
 	store_ptr += len;
 	nstored -= len;
     } else {
-	bcopy(store_ptr, buf, nstored);
+	memcpy(buf, store_ptr, nstored);
 	nreturned += nstored;
 	nstored = 0;
     }
@@ -1471,10 +1471,10 @@ int des_write(fd, buf, len)
 	}
 	garbage = random();
 	/* insert random garbage */
-	(void) bcopy(&garbage, garbage_buf, min(sizeof(long),8));
+	(void) memcpy(garbage_buf, &garbage, min(sizeof(long),8));
 	
 	/* this "right-justifies" the data in the buffer */
-	(void) bcopy(buf, garbage_buf + 8 - len, len);
+	(void) memcpy(garbage_buf + 8 - len, buf, len);
     }
     
     (void) mit_des_cbc_encrypt((len < 8) ? garbage_buf : buf,
diff --git a/src/appl/bsd/krlogind.c b/src/appl/bsd/krlogind.c
index fb5c93b0c..fd0097efa 100644
--- a/src/appl/bsd/krlogind.c
+++ b/src/appl/bsd/krlogind.c
@@ -1543,12 +1543,12 @@ int len;
 		return(read(fd, buf, len));
 
 	if (nstored >= len) {
-		bcopy(store_ptr, buf, len);
+		memcpy(buf, store_ptr, len);
 		store_ptr += len;
 		nstored -= len;
 		return(len);
 	} else if (nstored) {
-		bcopy(store_ptr, buf, nstored);
+		memcpy(buf, store_ptr, nstored);
 		nreturned += nstored;
 		buf += nstored;
 		len -= nstored;
@@ -1590,12 +1590,12 @@ int len;
 		store_ptr = storage;
 	nstored = net_len;
 	if (nstored > len) {
-		bcopy(store_ptr, buf, len);
+		memcpy(buf, store_ptr, len);
 		nreturned += len;
 		store_ptr += len;
 		nstored -= len;
 	} else {
-		bcopy(store_ptr, buf, nstored);
+		memcpy(buf, store_ptr, nstored);
 		nreturned += nstored;
 		nstored = 0;
 	}
@@ -1641,10 +1641,10 @@ int len;
 		}
 		garbage = random();
 		/* insert random garbage */
-		(void) bcopy(&garbage, garbage_buf, min(sizeof(long),8));
+		(void) memcpy(garbage_buf, &garbage, min(sizeof(long),8));
 
 		/* this "right-justifies" the data in the buffer */
-		(void) bcopy(buf, garbage_buf + 8 - len, len);
+		(void) memcpy(garbage_buf + 8 - len, buf, len);
 	}
 	(void) pcbc_encrypt((len < 8) ? garbage_buf : buf,
 			    des_outbuf,
diff --git a/src/appl/bsd/login.c b/src/appl/bsd/login.c
index aeec53d74..4791801f0 100644
--- a/src/appl/bsd/login.c
+++ b/src/appl/bsd/login.c
@@ -1029,8 +1029,8 @@ do_krb_login(host, strict)
 	(void) memset((char *) &sin, 0, (int) sizeof(sin));
 
         if (hp)
-                (void) bcopy (hp->h_addr, (char *)&sin.sin_addr,
-			      sizeof(sin.sin_addr));
+                (void) memcpy ((char *)&sin.sin_addr, hp->h_addr,
+			       sizeof(sin.sin_addr));
 	else
 		sin.sin_addr.s_addr = inet_addr(host);
 
diff --git a/src/appl/bsd/setenv.c b/src/appl/bsd/setenv.c
index 08fa5f7ea..0b670db5d 100644
--- a/src/appl/bsd/setenv.c
+++ b/src/appl/bsd/setenv.c
@@ -65,7 +65,7 @@ setenv(name, value, rewrite)
 			    (cnt + 2)));
 			if (!P)
 				return(-1);
-			bcopy(environ, P, cnt * sizeof(char *));
+			memcpy(P, environ, cnt * sizeof(char *));
 			environ = P;
 		}
 		environ[cnt + 1] = NULL;