summaryrefslogtreecommitdiff
path: root/res/res_phoneprov.c
diff options
context:
space:
mode:
authorSean Bright <sean@malleable.com>2010-01-15 18:21:50 +0000
committerSean Bright <sean@malleable.com>2010-01-15 18:21:50 +0000
commite612d87695ec794059dfe3fc0021bd11a331713d (patch)
treeede1629dadd9e525779f3da8f54510a9dd1ea081 /res/res_phoneprov.c
parent89413e9ae2d8f0105758c5007313d60c540a8253 (diff)
Convert a few places to use ast_calloc_with_stringfields where applicable.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@240368 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_phoneprov.c')
-rw-r--r--res/res_phoneprov.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/res/res_phoneprov.c b/res/res_phoneprov.c
index 49fdbf870..ff3046bf5 100644
--- a/res/res_phoneprov.c
+++ b/res/res_phoneprov.c
@@ -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;
}