Changed bcopy to memcpy [ANSI]

14 files changed, 19 insertions, 19 deletions

diff --git a/lib/ZCkAuth.c b/lib/ZCkAuth.c
index 9fc6b5b..6670b1f 100644
--- a/lib/ZCkAuth.c
+++ b/lib/ZCkAuth.c
@@ -64,8 +64,8 @@ int ZCheckAuthentication(notice, from)
 			    SERVER_INSTANCE, from->sin_addr.s_addr, 
 			    &dat, srvtab);
 	if (result == RD_AP_OK) {
-		_BCOPY((char *)dat.session, (char *)__Zephyr_session, 
-		      sizeof(C_Block));
+		(void) memcpy((char *)__Zephyr_session, (char *)dat.session, 
+			       sizeof(C_Block));
 		(void) sprintf(srcprincipal, "%s%s%s@%s", dat.pname, 
 			       dat.pinst[0]?".":"", dat.pinst, dat.prealm);
 		if (strcmp(srcprincipal, notice->z_sender))
diff --git a/lib/ZCkIfNot.c b/lib/ZCkIfNot.c
index 6355680..6ca5ef7 100644
--- a/lib/ZCkIfNot.c
+++ b/lib/ZCkIfNot.c
@@ -41,7 +41,7 @@ Code_t ZCheckIfNotice(notice, from, predicate, args)
 	if ((*predicate)(&tmpnotice, args)) {
 	    if (!(buffer = (char *) malloc((unsigned) qptr->packet_len)))
 		return (ENOMEM);
-	    _BCOPY(qptr->packet, buffer, qptr->packet_len);
+	    (void) memcpy(buffer, qptr->packet, qptr->packet_len);
 	    if (from)
 		*from = qptr->from;
 	    if ((retval = ZParseNotice(buffer, qptr->packet_len, 
diff --git a/lib/ZFmtAuth.c b/lib/ZFmtAuth.c
index 89416d0..cdf7be4 100644
--- a/lib/ZFmtAuth.c
+++ b/lib/ZFmtAuth.c
@@ -57,7 +57,7 @@ Code_t ZFormatAuthenticNotice(notice, buffer, buffer_len, len, session)
     if (newnotice.z_message_len+hdrlen > buffer_len)
 	return (ZERR_PKTLEN);
 
-    _BCOPY(newnotice.z_message, ptr, newnotice.z_message_len);
+    (void) memcpy(ptr, newnotice.z_message, newnotice.z_message_len);
 
     *len = hdrlen+newnotice.z_message_len;
 
diff --git a/lib/ZFmtList.c b/lib/ZFmtList.c
index b829150..baf2dda 100644
--- a/lib/ZFmtList.c
+++ b/lib/ZFmtList.c
@@ -48,13 +48,13 @@ Code_t ZFormatNoticeList(notice, list, nitems, buffer, ret_len,
     if (!(*buffer = (char *) malloc((unsigned)*ret_len)))
 	return (ENOMEM);
 
-    _BCOPY(header, *buffer, hdrlen);
+    (void) memcpy(*buffer, header, hdrlen);
 
     ptr = *buffer+hdrlen;
 
     for (;nitems;nitems--, list++) {
 	i = strlen(*list)+1;
-	_BCOPY(*list, ptr, i);
+	(void) memcpy(ptr, *list, i);
 	ptr += i;
     }
 
diff --git a/lib/ZFmtNotice.c b/lib/ZFmtNotice.c
index 7192b97..96147f8 100644
--- a/lib/ZFmtNotice.c
+++ b/lib/ZFmtNotice.c
@@ -38,8 +38,8 @@ Code_t ZFormatNotice(notice, buffer, ret_len, cert_routine)
     if (!(*buffer = (char *) malloc((unsigned)*ret_len)))
 	return (ENOMEM);
 
-    _BCOPY(header, *buffer, hdrlen);
-    _BCOPY(notice->z_message, *buffer+hdrlen, notice->z_message_len);
+    (void) memcpy(*buffer, header, hdrlen);
+    (void) memcpy(*buffer+hdrlen, notice->z_message, notice->z_message_len);
 
     return (ZERR_NONE);
 }
diff --git a/lib/ZFmtRaw.c b/lib/ZFmtRaw.c
index 8d0844f..5d4c0a3 100644
--- a/lib/ZFmtRaw.c
+++ b/lib/ZFmtRaw.c
@@ -37,8 +37,8 @@ Code_t ZFormatRawNotice(notice, buffer, ret_len)
     if (!(*buffer = (char *) malloc((unsigned) *ret_len)))
 	return (ENOMEM);
 
-    _BCOPY(header, *buffer, hdrlen);
-    _BCOPY(notice->z_message, *buffer+hdrlen, notice->z_message_len);
+    (void) memcpy(*buffer, header, hdrlen);
+    (void) memcpy(*buffer+hdrlen, notice->z_message, notice->z_message_len);
 
     return (ZERR_NONE);
 }
diff --git a/lib/ZFmtRawLst.c b/lib/ZFmtRawLst.c
index eef764f..eb8a969 100644
--- a/lib/ZFmtRawLst.c
+++ b/lib/ZFmtRawLst.c
@@ -45,13 +45,13 @@ Code_t ZFormatRawNoticeList(notice, list, nitems, buffer, ret_len)
     if (!(*buffer = (char *) malloc((unsigned) *ret_len)))
 	return (ENOMEM);
 
-    _BCOPY(header, *buffer, hdrlen);
+    (void) memcpy(*buffer, header, hdrlen);
     
     ptr = *buffer+hdrlen;
 
     for (;nitems;nitems--, list++) {
 	i = strlen(*list)+1;
-	_BCOPY(*list, ptr, i);
+	(void) memcpy(ptr, *list, i);
 	ptr += i;
     }
 
diff --git a/lib/ZFmtSmRLst.c b/lib/ZFmtSmRLst.c
index 60c4ecc..f3ab7cb 100644
--- a/lib/ZFmtSmRLst.c
+++ b/lib/ZFmtSmRLst.c
@@ -48,7 +48,7 @@ Code_t ZFormatSmallRawNoticeList(notice, list, nitems, buffer, ret_len)
 
     for (;nitems;nitems--, list++) {
 	i = strlen(*list)+1;
-	_BCOPY(*list, ptr, i);
+	(void) memcpy(ptr, *list, i);
 	ptr += i;
     }
 
diff --git a/lib/ZFmtSmRaw.c b/lib/ZFmtSmRaw.c
index 039591c..7269b42 100644
--- a/lib/ZFmtSmRaw.c
+++ b/lib/ZFmtSmRaw.c
@@ -37,7 +37,7 @@ Code_t ZFormatSmallRawNotice(notice, buffer, ret_len)
     if (*ret_len > Z_MAXPKTLEN)
 	return (ZERR_PKTLEN);
 
-    _BCOPY(notice->z_message, buffer+hdrlen, notice->z_message_len);
+    (void) memcpy(buffer+hdrlen, notice->z_message, notice->z_message_len);
 
     return (ZERR_NONE);
 }
diff --git a/lib/ZIfNotice.c b/lib/ZIfNotice.c
index 2729619..e49e6bb 100644
--- a/lib/ZIfNotice.c
+++ b/lib/ZIfNotice.c
@@ -44,7 +44,7 @@ Code_t ZIfNotice(notice, from, predicate, args)
 	    if ((*predicate)(&tmpnotice, args)) {
 		if (!(buffer = (char *) malloc((unsigned) qptr->packet_len)))
 		    return (ENOMEM);
-		_BCOPY(qptr->packet, buffer, qptr->packet_len);
+		(void) memcpy(buffer, qptr->packet, qptr->packet_len);
 		if (from)
 		    *from = qptr->from;
 		if ((retval = ZParseNotice(buffer, qptr->packet_len, 
diff --git a/lib/ZPeekIfNot.c b/lib/ZPeekIfNot.c
index c6e8814..a010fa6 100644
--- a/lib/ZPeekIfNot.c
+++ b/lib/ZPeekIfNot.c
@@ -43,7 +43,7 @@ Code_t ZPeekIfNotice(notice, from, predicate, args)
 	    if ((*predicate)(&tmpnotice, args)) {
 		if (!(buffer = (char *) malloc((unsigned) qptr->packet_len)))
 		    return (ENOMEM);
-		_BCOPY(qptr->packet, buffer, qptr->packet_len);
+		(void) memcpy(buffer, qptr->packet, qptr->packet_len);
 		if (from)
 		    *from = qptr->from;
 		if ((retval = ZParseNotice(buffer, qptr->packet_len, 
diff --git a/lib/ZPeekPkt.c b/lib/ZPeekPkt.c
index ed47e65..439194b 100644
--- a/lib/ZPeekPkt.c
+++ b/lib/ZPeekPkt.c
@@ -38,7 +38,7 @@ Code_t ZPeekPacket(buffer, ret_len, from)
     if (!(*buffer = (char *) malloc((unsigned) *ret_len)))
 	return (ENOMEM);
 
-    _BCOPY(nextq->packet, *buffer, *ret_len);
+    (void) memcpy(*buffer, nextq->packet, *ret_len);
 
     if (from)
 	*from = nextq->from;
diff --git a/lib/ZRecvNot.c b/lib/ZRecvNot.c
index c59a603..0b1b278 100644
--- a/lib/ZRecvNot.c
+++ b/lib/ZRecvNot.c
@@ -42,7 +42,7 @@ Code_t ZReceiveNotice(notice, from)
     if (from)
 	*from = nextq->from;
     
-    _BCOPY(nextq->packet, buffer, len);
+    (void) memcpy(buffer, nextq->packet, len);
 
     Z_RemQueue(nextq);
     
diff --git a/lib/ZRecvPkt.c b/lib/ZRecvPkt.c
index 70405a1..645aeba 100644
--- a/lib/ZRecvPkt.c
+++ b/lib/ZRecvPkt.c
@@ -37,7 +37,7 @@ Code_t ZReceivePacket(buffer, ret_len, from)
     if (*ret_len > Z_MAXPKTLEN)
 	return (ZERR_PKTLEN);
     
-    _BCOPY(nextq->packet, buffer, *ret_len);
+    (void) memcpy(buffer, nextq->packet, *ret_len);
 
     if (from)
 	*from = nextq->from;