diff options
author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-09 15:06:21 +0000 |
---|---|---|
committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-09 15:06:21 +0000 |
commit | 67c6e3c37dabf65fb77a9c1f89f69550dfc319f7 (patch) | |
tree | 867b49816ced0aa9f069da445b711c4f12978b74 /channels | |
parent | 51619435a4ed586a1d35d60acdfee494112c59d2 (diff) |
Merged revisions 147807 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r147807 | murf | 2008-10-09 08:17:33 -0600 (Thu, 09 Oct 2008) | 15 lines
(closes issue #13557)
Reported by: nickpeirson
Patches:
pbx.c.patch uploaded by nickpeirson (license 579)
replace_bzero+bcopy.patch uploaded by nickpeirson (license 579)
Tested by: nickpeirson, murf
1. replaced all refs to bzero and bcopy to memset and memmove instead.
2. added a note to the CODING-GUIDELINES
3. add two macros to asterisk.h to prevent bzero, bcopy from creeping
back into the source
4. removed bzero from configure, configure.ac, autoconfig.h.in
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@147811 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_iax2.c | 4 | ||||
-rw-r--r-- | channels/chan_oss.c | 2 | ||||
-rw-r--r-- | channels/chan_usbradio.c | 8 | ||||
-rw-r--r-- | channels/console_gui.c | 8 | ||||
-rw-r--r-- | channels/console_video.c | 4 | ||||
-rw-r--r-- | channels/vcodecs.c | 14 |
6 files changed, 20 insertions, 20 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 79dbe514b..c8d2308cf 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -6580,7 +6580,7 @@ static int try_transfer(struct chan_iax2_pvt *pvt, struct iax_ies *ies) 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) { @@ -6718,7 +6718,7 @@ static int iax2_ack_registry(struct iax_ies *ies, struct sockaddr_in *sin, int c memset(&us, 0, sizeof(us)); if (ies->apparent_addr) - bcopy(ies->apparent_addr, &us, sizeof(us)); + memmove(&us, ies->apparent_addr, sizeof(us)); if (ies->username) ast_copy_string(peer, ies->username, sizeof(peer)); if (ies->refresh) diff --git a/channels/chan_oss.c b/channels/chan_oss.c index 7227c4b61..6f12d6bc8 100644 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -701,7 +701,7 @@ static struct ast_frame *oss_read(struct ast_channel *c) /* 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; diff --git a/channels/chan_usbradio.c b/channels/chan_usbradio.c index f3196e30c..a5daebe7c 100644 --- a/channels/chan_usbradio.c +++ b/channels/chan_usbradio.c @@ -1411,7 +1411,7 @@ static void send_sound(struct chan_usbradio_pvt *o) l = FRAME_SIZE - ofs; if (l > s->datalen - start) /* don't overflow the source */ l = s->datalen - start; - bcopy(s->data + start, myframe + ofs, l * 2); + memmove(myframe + ofs, s->data + start, l * 2); if (0) ast_log(LOG_WARNING, "send_sound sound %d/%d of %d into %d\n", l_sampsent, l, s->samplen, ofs); l_sampsent += l; @@ -1422,14 +1422,14 @@ static void send_sound(struct chan_usbradio_pvt *o) if (l > 0) { if (l > FRAME_SIZE - ofs) l = FRAME_SIZE - ofs; - bcopy(silence, myframe + ofs, l * 2); + memmove(myframe + ofs, silence, l * 2); l_sampsent += l; } else { /* silence is over, restart sound if loop */ if (s->repeat == 0) { /* last block */ o->cursound = -1; o->nosound = 0; /* allow audio data */ if (ofs < FRAME_SIZE) /* pad with silence */ - bcopy(silence, myframe + ofs, (FRAME_SIZE - ofs) * 2); + memmove(myframe + ofs, silence, (FRAME_SIZE - ofs) * 2); } l_sampsent = 0; } @@ -1813,7 +1813,7 @@ static struct ast_frame *usbradio_read(struct ast_channel *c) } /* 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; diff --git a/channels/console_gui.c b/channels/console_gui.c index 480f6f1ce..c3ced5e49 100644 --- a/channels/console_gui.c +++ b/channels/console_gui.c @@ -204,7 +204,7 @@ static struct gui_info *cleanup_sdl(struct gui_info *gui, int device_num) if (gui->win[i].bmp) SDL_FreeYUVOverlay(gui->win[i].bmp); } - bzero(gui, sizeof(gui)); + memset(gui, '\0', sizeof(gui)); /* deallocates the space allocated for the keypad message boards */ if (gui->bd_dialed) @@ -290,7 +290,7 @@ static void show_frame(struct video_desc *env, int out) bmp = gui->win[out].bmp; SDL_LockYUVOverlay(bmp); /* output picture info - this is sdl, YUV420P */ - bzero(&p_out, sizeof(p_out)); + memset(&p_out, '\0', sizeof(p_out)); p_out.data[0] = bmp->pixels[0]; p_out.data[1] = bmp->pixels[1]; p_out.data[2] = bmp->pixels[2]; @@ -1358,7 +1358,7 @@ static void sdl_setup(struct video_desc *env) FocusChangeMask | PropertyChangeMask | ColormapChangeMask | OwnerGrabButtonMask; - bzero(&attr, sizeof(attr)); + memset(&attr, '\0', sizeof(attr)); XGetWindowAttributes(SDL_Display, win, &attr); /* the following events can be delivered only to one client. @@ -1565,7 +1565,7 @@ static int keypad_cfg_read(struct gui_info *gui, const char *val) return 0; s1[0] = s2[0] = '\0'; - bzero(&e, sizeof(e)); + memset(&e, '\0', sizeof(e)); i = sscanf(val, "%14s %14s %d %d %d %d %d", s1, s2, &e.x0, &e.y0, &e.x1, &e.y1, &e.h); diff --git a/channels/console_video.c b/channels/console_video.c index a7735a665..88bf807d5 100644 --- a/channels/console_video.c +++ b/channels/console_video.c @@ -272,7 +272,7 @@ void fbuf_free(struct fbuf_t *b) if (b->data && b->size) ast_free(b->data); - bzero(b, sizeof(*b)); + memset(b, '\0', sizeof(*b)); /* restore some fields */ b->w = x.w; b->h = x.h; @@ -587,7 +587,7 @@ static AVPicture *fill_pict(struct fbuf_t *b, AVPicture *p) int luv = b->w/2; /* U/V linesize, bytes */ int sample_size = 1; - bzero(p, sizeof(*p)); + memset(p, '\0', sizeof(*p)); switch (b->pix_fmt) { case PIX_FMT_RGB555: case PIX_FMT_RGB565: diff --git a/channels/vcodecs.c b/channels/vcodecs.c index 90f7258b1..ecb7a8c71 100644 --- a/channels/vcodecs.c +++ b/channels/vcodecs.c @@ -204,7 +204,7 @@ void dump_buf(struct fbuf_t *b) if ( x == 0) { /* new line */ if (i != 0) ast_log(LOG_WARNING, "%s\n", buf); - bzero(buf, sizeof(buf)); + memset(buf, '\0', sizeof(buf)); sprintf(buf, "%04x: ", i); } sprintf(buf + 6 + x*3, "%02x ", b->data[i]); @@ -504,7 +504,7 @@ static int ffmpeg_decode(struct video_dec_desc *v, struct fbuf_t *b) } } 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 @@ static struct ast_frame *h263_encap(struct fbuf_t *b, int mtu, 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 @@ -647,7 +647,7 @@ static struct ast_frame *h263_encap(struct fbuf_t *b, int mtu, if (!f) break; - bcopy(h, f->data.ptr, 4); /* copy the h263 header */ + memmove(f->data.ptr, h, 4); /* copy the h263 header */ /* XXX to do: if not aligned, fix sbit and ebit, * then move i back by 1 for the next frame */ @@ -737,7 +737,7 @@ static struct ast_frame *h261_encap(struct fbuf_t *b, int mtu, if (len < H261_MIN_LEN) /* unreasonably small */ return NULL; - bzero(h261_hdr, sizeof(h261_hdr)); + memset(h261_hdr, '\0', sizeof(h261_hdr)); /* Similar to the code in h263_encap, but the marker there is longer. * Start a few bytes within the bitstream to avoid hitting the marker @@ -801,7 +801,7 @@ static struct ast_frame *h261_encap(struct fbuf_t *b, int mtu, break; /* recompute header with I=0, V=1 */ h[0] = ( (sbit & 7) << 5 ) | ( (ebit & 7) << 2 ) | 1; - bcopy(h, f->data.ptr, 4); /* copy the h261 header */ + memmove(f->data.ptr, h, 4); /* copy the h261 header */ if (ebit) /* not aligned, restart from previous byte */ i--; sbit = (8 - ebit) & 7; @@ -902,7 +902,7 @@ static int mpeg4_decode(struct video_dec_desc *v, struct fbuf_t *b) } datalen -= ret; if (datalen > 0) /* update b with leftover bytes */ - bcopy(b->data + ret, b->data, datalen); + memmove(b->data, b->data + ret, datalen); b->used = datalen; b->ebit = 0; return full_frame; |