diff options
| author | Scott Griepentrog <sgriepentrog@digium.com> | 2015-03-17 22:15:42 +0000 |
|---|---|---|
| committer | Scott Griepentrog <sgriepentrog@digium.com> | 2015-03-17 22:15:42 +0000 |
| commit | 8c65c9167ee6fe75c7e7f511d12480831f98dad3 (patch) | |
| tree | 5cde1e58b672d19b1ca5cdc2c9ad6f128bddf37b /include | |
| parent | f25b2653293d0d96479d3d83795f40828f0b7bb7 (diff) | |
Various: bugfixes found via chaos
Using DEBUG_CHAOS several instances of a null
pointer crash, and one uninitialized variable
were uncovered and fixed. Also added details
on why Asterisk failed to initialize.
Review: https://reviewboard.asterisk.org/r/4468/
........
Merged revisions 433064 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@433065 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/config.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asterisk/config.h b/include/asterisk/config.h index 23c91b027..6489344ad 100644 --- a/include/asterisk/config.h +++ b/include/asterisk/config.h @@ -844,8 +844,11 @@ void ast_category_append(struct ast_config *config, struct ast_category *cat); * * \details * This function is used to apply a base (template) to an existing category + * + * \retval 0 if succeeded + * \retval -1 if the memory allocation failed */ -void ast_category_inherit(struct ast_category *existing, const struct ast_category *base); +int ast_category_inherit(struct ast_category *existing, const struct ast_category *base); /*! * \brief Removes and destroys all variables in a category |