diff options
| author | Joshua Colp <jcolp@digium.com> | 2018-01-04 06:53:28 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-01-04 06:53:28 -0600 |
| commit | 307abc4cad348167fedf8d1a114d9fc9e9a770b9 (patch) | |
| tree | 3ec5f3f9c3481115219177895ce297c86281f1f3 /include/asterisk | |
| parent | 7f4facc5e4a96ccae10283da998044becc4fbe11 (diff) | |
| parent | 0fe7df641aa0e23b8400d32b935de4834ee4f182 (diff) | |
Merge "datastore: Add automatic module references."
Diffstat (limited to 'include/asterisk')
| -rw-r--r-- | include/asterisk/datastore.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/asterisk/datastore.h b/include/asterisk/datastore.h index 85e9c6890..8d6516bc1 100644 --- a/include/asterisk/datastore.h +++ b/include/asterisk/datastore.h @@ -69,6 +69,7 @@ struct ast_datastore { const char *uid; /*!< Unique data store identifier */ void *data; /*!< Contained data */ const struct ast_datastore_info *info; /*!< Data store type information */ + struct ast_module *mod; /*!< Module referenced by this datastore */ unsigned int inheritance; /*!< Number of levels this item will continue to be inherited */ AST_LIST_ENTRY(ast_datastore) entry; /*!< Used for easy linking */ }; @@ -77,13 +78,16 @@ struct ast_datastore { * \brief Create a data store object * \param[in] info information describing the data store object * \param[in] uid unique identifer + * \param[in] mod The module to hold until this datastore is freed. * \param file, line, function * \version 1.6.1 moved here and renamed from ast_channel_datastore_alloc */ -struct ast_datastore * attribute_malloc __ast_datastore_alloc(const struct ast_datastore_info *info, const char *uid, - const char *file, int line, const char *function); +struct ast_datastore * attribute_malloc __ast_datastore_alloc( + const struct ast_datastore_info *info, const char *uid, struct ast_module *mod, + const char *file, int line, const char *function); -#define ast_datastore_alloc(info, uid) __ast_datastore_alloc(info, uid, __FILE__, __LINE__, __PRETTY_FUNCTION__) +#define ast_datastore_alloc(info, uid) \ + __ast_datastore_alloc(info, uid, AST_MODULE_SELF, __FILE__, __LINE__, __PRETTY_FUNCTION__) /*! * \brief Free a data store object |