kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 14:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue 9869 - replace malloc and memset with ast_calloc, and other coding guidelines changes

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67864 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2007-06-06 21:20:11 +00:00
parent 033a3df22a
commit 9d05ff8ed5
94 changed files with 2530 additions and 2701 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
main/asterisk.c
View File

@@ -294,7 +294,7 @@ void ast_unregister_file_version(const char *file)
AST_LIST_TRAVERSE_SAFE_END;
AST_LIST_UNLOCK(&file_versions);
if (find)
free(find);
ast_free(find);
}
struct thread_list_t {
@@ -336,8 +336,8 @@ void ast_unregister_thread(void *id)
AST_LIST_TRAVERSE_SAFE_END;
AST_LIST_UNLOCK(&thread_list);
if (x) {
free(x->name);
free(x);
ast_free(x->name);
ast_free(x);
}
}
@@ -2036,7 +2036,7 @@ static int ast_cli_display_match_list(char **matches, int len, int max)
/* Don't print dupes */
if ( (matches[idx+1] != NULL && strcmp(matches[idx], matches[idx+1]) == 0 ) ) {
i--;
free(matches[idx]);
ast_free(matches[idx]);
matches[idx] = NULL;
continue;
}
@@ -2044,7 +2044,7 @@ static int ast_cli_display_match_list(char **matches, int len, int max)
numoutput++;
numoutputline++;
fprintf(stdout, "%-*s ", max, matches[idx]);
free(matches[idx]);
ast_free(matches[idx]);
matches[idx] = NULL;
}
if (numoutputline > 0)
@@ -2113,7 +2113,7 @@ static char *cli_complete(EditLine *el, int ch)
mbuf[mlen] = '\0';
matches = ast_el_strtoarr(mbuf);
free(mbuf);
ast_free(mbuf);
} else
matches = (char **) NULL;
} else {
@@ -2159,8 +2159,8 @@ static char *cli_complete(EditLine *el, int ch)
}
}
for (i = 0; matches[i]; i++)
free(matches[i]);
free(matches);
ast_free(matches[i]);
ast_free(matches);
}
return (char *)(long)retval;