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/console_video.c | |
| 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/console_video.c')
| -rw-r--r-- | channels/console_video.c | 4 |
1 files changed, 2 insertions, 2 deletions
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: |