Index: channels/chan_iax2.c
===================================================================
--- channels/chan_iax2.c	(revision 145431)
+++ channels/chan_iax2.c	(working copy)
@@ -6587,7 +6587,7 @@
 	
 	memset(&ied, 0, sizeof(ied));
 	if (ies->apparent_addr)
-		bcopy(ies->apparent_addr, &new, sizeof(new));
+		memmove(&new, ies->apparent_addr, sizeof(new));
 	if (ies->callno)
 		newcall = ies->callno;
 	if (!newcall || !new.sin_addr.s_addr || !new.sin_port) {
Index: channels/chan_oss.c
===================================================================
--- channels/chan_oss.c	(revision 145431)
+++ channels/chan_oss.c	(working copy)
@@ -701,7 +701,7 @@
 
 	/* XXX can be simplified returning &ast_null_frame */
 	/* prepare a NULL frame in case we don't have enough data to return */
-	bzero(f, sizeof(struct ast_frame));
+	memset(f, '\0', sizeof(struct ast_frame));
 	f->frametype = AST_FRAME_NULL;
 	f->src = oss_tech.type;
 
Index: channels/chan_usbradio.c
===================================================================
--- channels/chan_usbradio.c	(revision 145431)
+++ channels/chan_usbradio.c	(working copy)
@@ -1813,7 +1813,7 @@
 	}
 	/* XXX can be simplified returning &ast_null_frame */
 	/* prepare a NULL frame in case we don't have enough data to return */
-	bzero(f, sizeof(struct ast_frame));
+	memset(f, '\0', sizeof(struct ast_frame));
 	f->frametype = AST_FRAME_NULL;
 	f->src = usbradio_tech.type;
 
Index: channels/vcodecs.c
===================================================================
--- channels/vcodecs.c	(revision 145431)
+++ channels/vcodecs.c	(working copy)
@@ -504,7 +504,7 @@
 		}
 	}
 	if (srclen != 0)	/* update b with leftover data */
-		bcopy(src, b->data, srclen);
+		memmove(b->data, src, srclen);
 	b->used = srclen;
 	b->ebit = 0;
 	return full_frame;
@@ -582,7 +582,7 @@
 	if (len < H263_MIN_LEN)	/* unreasonably small */
 		return NULL;
 
-	bzero(h263_hdr, sizeof(h263_hdr));
+	memset(h263_hdr, '\0', sizeof(h263_hdr));
 	/* Now set the header bytes. Only type A by now,
 	 * and h[0] = h[2] = h[3] = 0 by default.
 	 * PTYPE starts 30 bits in the picture, so the first useful
Index: main/astobj2.c
===================================================================
--- main/astobj2.c	(revision 145431)
+++ main/astobj2.c	(working copy)
@@ -262,7 +262,7 @@
 		/* for safety, zero-out the astobj2 header and also the
 		 * first word of the user-data, which we make sure is always
 		 * allocated. */
-		bzero(obj, sizeof(struct astobj2 *) + sizeof(void *) );
+		memset(obj, '\0', sizeof(struct astobj2 *) + sizeof(void *) );
 		free(obj);
 	}
 
Index: main/cli.c
===================================================================
--- main/cli.c	(revision 145431)
+++ main/cli.c	(working copy)
@@ -1426,7 +1426,7 @@
 		e->_full_cmd = NULL;
 		if (e->handler) {
 			/* this is a new-style entry. Reset fields and free memory. */
-			bzero((char **)(e->cmda), sizeof(e->cmda));
+			memset((char **)(e->cmda), '\0', sizeof(e->cmda));
 			ast_free(e->command);
 			e->command = NULL;
 			e->usage = NULL;
Index: main/config.c
===================================================================
--- main/config.c	(revision 145431)
+++ main/config.c	(working copy)
@@ -2340,7 +2340,7 @@
 		struct hostent *hp;
 		struct ast_hostent ahp;
 
-		bzero(&_sa_buf, sizeof(_sa_buf)); /* clear buffer */
+		memset(&_sa_buf, '\0', sizeof(_sa_buf)); /* clear buffer */
 		/* duplicate the string to strip away the :port */
 		port = ast_strdupa(arg);
 		buf = strsep(&port, ":");
Index: main/pbx.c
===================================================================
--- main/pbx.c	(revision 145431)
+++ main/pbx.c	(working copy)
@@ -1728,7 +1728,7 @@
 		return 0x40000;	/* XXX make this entry go last... */
 	}
 
-	bzero(chars, sizeof(chars));	/* clear all chars in the set */
+	memset(chars, '\0', sizeof(chars));	/* clear all chars in the set */
 	for (; *p < end  ; (*p)++) {
 		unsigned char c1, c2;	/* first-last char in range */
 		c1 = (unsigned char)((*p)[0]);
Index: main/rtp.c
===================================================================
--- main/rtp.c	(revision 145431)
+++ main/rtp.c	(working copy)
@@ -675,7 +675,7 @@
 		res = ast_select(s + 1, &rfds, NULL, NULL, &to);
 		if (res <= 0)	/* timeout or error */
 			continue;
-		bzero(&src, sizeof(src));
+		memset(&src, '\0', sizeof(src));
 		srclen = sizeof(src);
 		/* XXX pass -1 in the size, because stun_handle_packet might
 		 * write past the end of the buffer.
Index: main/translate.c
===================================================================
--- main/translate.c	(revision 145431)
+++ main/translate.c	(working copy)
@@ -451,7 +451,7 @@
 
 	ast_debug(1, "Resetting translation matrix\n");
 
-	bzero(tr_matrix, sizeof(tr_matrix));
+	memset(tr_matrix, '\0', sizeof(tr_matrix));
 
 	/* first, compute all direct costs */
 	AST_RWLIST_TRAVERSE(&translators, t, list) {
Index: utils/extconf.c
===================================================================
--- utils/extconf.c	(revision 145431)
+++ utils/extconf.c	(working copy)
@@ -4406,7 +4406,7 @@
 		return 0x40000;	/* XXX make this entry go last... */
 	}
 
-	bzero(chars, sizeof(chars));	/* clear all chars in the set */
+	memset(chars, '\0', sizeof(chars));	/* clear all chars in the set */
 	for (; *p < end  ; (*p)++) {
 		unsigned char c1, c2;	/* first-last char in range */
 		c1 = (unsigned char)((*p)[0]);