Changed bzero/bcopy to memset/memcpy [ANSI]

1 files changed, 17 insertions, 15 deletions

diff --git a/lib/Zinternal.c b/lib/Zinternal.c
index ac42c68..411e7b2 100644
--- a/lib/Zinternal.c
+++ b/lib/Zinternal.c
@@ -91,7 +91,7 @@ Code_t Z_GetMyAddr()
 
     __My_length = myhost->h_length;
 
-    _BCOPY(myhost->h_addr, __My_addr, myhost->h_length);
+    (void) memcpy(__My_addr, myhost->h_addr, myhost->h_length);
 
     return (ZERR_NONE);
 } 
@@ -249,8 +249,8 @@ Code_t Z_ReadWait()
 	    __HM_addr = olddest;
 	}
 	if (filter_idx == -1) {
-	    _BZERO((char *) old_uids,
-		  Z_FILTERDEPTH*(sizeof(struct _filter)));
+	    (void) memset((char *) old_uids, 0,
+			  Z_FILTERDEPTH*(sizeof(struct _filter)));
 	    old_uids[0].uid = notice.z_uid;
 	    old_uids[0].kind = notice.z_kind;
 	    filter_idx = 1;
@@ -324,7 +324,7 @@ Code_t Z_ReadWait()
 		qptr->header = (char *) malloc((unsigned) qptr->header_len);
 		if (!qptr->header)
 		    return (ENOMEM);
-		_BCOPY(packet, qptr->header, qptr->header_len);
+		(void) memcpy(qptr->header, packet, qptr->header_len);
 	    }
 	    return (Z_AddNoticeToEntry(qptr, &notice, part));
 	}
@@ -344,7 +344,7 @@ Code_t Z_ReadWait()
     qptr = (struct _Z_InputQ *)malloc(sizeof(struct _Z_InputQ));
     if (!qptr)
 	return (ENOMEM);
-    _BZERO((char *)qptr, sizeof(struct _Z_InputQ));
+    (void) memset((char *)qptr, 0, sizeof(struct _Z_InputQ));
 
     /* Insert the entry at the end of the queue */
     qptr->next = NULL;
@@ -376,7 +376,7 @@ Code_t Z_ReadWait()
 	qptr->header = (char *) malloc((unsigned) qptr->header_len);
 	if (!qptr->header)
 	    return ENOMEM;
-	_BCOPY(packet, qptr->header, qptr->header_len);
+	(void) memcpy(qptr->header, packet, qptr->header_len);
     }
 
     /*
@@ -394,15 +394,16 @@ Code_t Z_ReadWait()
 	else if (!(qptr->msg = (char *) malloc((unsigned) notice.z_message_len)))
 	    return(ENOMEM);
 	else
-	    _BCOPY(notice.z_message, qptr->msg, notice.z_message_len);
+	    (void) memcpy(qptr->msg, notice.z_message, notice.z_message_len);
 	qptr->msg_len = notice.z_message_len;
 	__Q_Size += notice.z_message_len;
 	qptr->packet_len = qptr->header_len+qptr->msg_len;
 	if (!(qptr->packet = (char *) malloc((unsigned) qptr->packet_len)))
 	    return (ENOMEM);
-	_BCOPY(qptr->header, qptr->packet, qptr->header_len);
+	(void) memcpy(qptr->packet, qptr->header, qptr->header_len);
 	if(qptr->msg)
-	    _BCOPY(qptr->msg, qptr->packet+qptr->header_len, qptr->msg_len);
+	    (void) memcpy(qptr->packet+qptr->header_len, qptr->msg,
+			   qptr->msg_len);
 	return (ZERR_NONE);
     }
 
@@ -450,7 +451,7 @@ Code_t Z_AddNoticeToEntry(qptr, notice, part)
     lasthole = (struct _Z_Hole *) 0;
 
     /* copy in the message body */
-    (void) _BCOPY(notice->z_message, qptr->msg+part, notice->z_message_len);
+    (void) memcpy(qptr->msg+part, notice->z_message, notice->z_message_len);
 
     /* Search for a hole that overlaps with the current fragment */
     while (hole) {
@@ -531,8 +532,9 @@ Code_t Z_AddNoticeToEntry(qptr, notice, part)
 	qptr->packet_len = qptr->header_len+qptr->msg_len;
 	if (!(qptr->packet = (char *) malloc((unsigned) qptr->packet_len)))
 	    return (ENOMEM);
-	_BCOPY(qptr->header, qptr->packet, qptr->header_len);
-	_BCOPY(qptr->msg, qptr->packet+qptr->header_len, qptr->msg_len);
+	(void) memcpy(qptr->packet, qptr->header, qptr->header_len);
+	(void) memcpy(qptr->packet+qptr->header_len, qptr->msg,
+		       qptr->msg_len);
     }
     
     return (ZERR_NONE);
@@ -560,7 +562,7 @@ Code_t Z_FormatHeader(notice, buffer, buffer_len, len, cert_routine)
     if ((retval = Z_GetMyAddr()) != ZERR_NONE)
 	return (retval);
 
-    _BCOPY(__My_addr, (char *)&notice->z_uid.zuid_addr, __My_length);
+    (void) memcpy((char *)&notice->z_uid.zuid_addr, __My_addr, __My_length);
 
     notice->z_multiuid = notice->z_uid;
 
@@ -839,8 +841,8 @@ Code_t Z_SendFragmentedNotice(notice, len, send_func)
 		htonl((u_long) partnotice.z_uid.tv.tv_usec);
 	    if ((retval = Z_GetMyAddr()) != ZERR_NONE)
 		return (retval);
-	    _BCOPY(__My_addr, (char *)&partnotice.z_uid.zuid_addr,
-		  __My_length);
+	    (void) memcpy((char *)&partnotice.z_uid.zuid_addr, __My_addr, 
+			   __My_length);
 	}
 	partnotice.z_message = notice->z_message+offset;
 	partnotice.z_message_len = min(notice->z_message_len-offset,