diff options
| author | Steve Murphy <murf@digium.com> | 2008-10-09 14:17:33 +0000 |
|---|---|---|
| committer | Steve Murphy <murf@digium.com> | 2008-10-09 14:17:33 +0000 |
| commit | e235a073769eaf6e388bbe8d4eb5189db4018de6 (patch) | |
| tree | 3c963213e39ade4edd8366a127b3d3fe9d74e360 /main/cli.c | |
| parent | f6c78aa0feb3e13fc8e7262a650ab4c8aa4babe2 (diff) | |
(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: https://origsvn.digium.com/svn/asterisk/trunk@147807 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/cli.c')
| -rw-r--r-- | main/cli.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/cli.c b/main/cli.c index 784628226..0b8120617 100644 --- a/main/cli.c +++ b/main/cli.c @@ -1426,7 +1426,7 @@ static int __ast_cli_unregister(struct ast_cli_entry *e, struct ast_cli_entry *e 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; @@ -1444,7 +1444,7 @@ static int __ast_cli_register(struct ast_cli_entry *e, struct ast_cli_entry *ed) char **dst = (char **)e->cmda; /* need to cast as the entry is readonly */ char *s; - bzero (&a, sizeof(a)); + memset(&a, '\0', sizeof(a)); e->handler(e, CLI_INIT, &a); /* XXX check that usage and command are filled up */ s = ast_skip_blanks(e->command); |