kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 02:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert a few places to use ast_calloc_with_stringfields where applicable.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@240368 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2010-01-15 18:21:50 +00:00
parent 89413e9ae2
commit e612d87695
10 changed files with 16 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
res/res_phoneprov.c
View File

@@ -636,12 +636,7 @@ static void build_profile(const char *name, struct ast_variable *v)
AST_APP_ARG(mimetype);
);
if (!(pp_file = ast_calloc(1, sizeof(*pp_file)))) {
profile = unref_profile(profile);
return;
}
if (ast_string_field_init(pp_file, 32)) {
ast_free(pp_file);
if (!(pp_file = ast_calloc_with_stringfields(1, struct phoneprov_file, 32))) {
profile = unref_profile(profile);
return;
}
@@ -712,13 +707,7 @@ static struct extension *build_extension(struct ast_config *cfg, const char *nam
const char *tmp;
int i;
if (!(exten = ast_calloc(1, sizeof(*exten)))) {
return NULL;
}
if (ast_string_field_init(exten, 32)) {
ast_free(exten);
exten = NULL;
if (!(exten = ast_calloc_with_stringfields(1, struct extension, 32))) {
return NULL;
}

7
res/res_smdi.c
View File

@@ -848,13 +848,8 @@ static void append_mailbox_mapping(struct ast_variable *var, struct ast_smdi_int
struct mailbox_mapping *mm;
char *mailbox, *context;
if (!(mm = ast_calloc(1, sizeof(*mm))))
if (!(mm = ast_calloc_with_stringfields(1, struct mailbox_mapping, 32)))
return;
if (ast_string_field_init(mm, 32)) {
free(mm);
return;
}
ast_string_field_set(mm, smdi, var->name);