diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-05 12:44:54 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-05 12:44:54 +0000 |
commit | f9d5244eed26b45ef81a7373603fb0fa30370bb8 (patch) | |
tree | 6266b49e25f2f06598d8bec0ae2b292b184dbe46 /include/asterisk/datastore.h | |
parent | bb03adc8d4713a0c7874ad852f6e1c0de1c8484a (diff) |
Merged revisions 192318 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r192318 | kpfleming | 2009-05-05 12:34:19 +0200 (Tue, 05 May 2009) | 5 lines
Properly account for memory allocated for channels and datastores
As in previous commits, when channels are allocated (with ast_channel_alloc) or datastores are allocated (with ast_datastore_alloc) properly account for the memory being owned by the caller, instead of the allocator function itself.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@192354 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk/datastore.h')
-rw-r--r-- | include/asterisk/datastore.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asterisk/datastore.h b/include/asterisk/datastore.h index 6da1bd0bb..5f7e52348 100644 --- a/include/asterisk/datastore.h +++ b/include/asterisk/datastore.h @@ -65,7 +65,10 @@ struct ast_datastore { * \param[in] uid unique identifer * \version 1.6.1 moved here and renamed from ast_channel_datastore_alloc */ -struct ast_datastore *ast_datastore_alloc(const struct ast_datastore_info *info, const char *uid); +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); + +#define ast_datastore_alloc(info, uid) __ast_datastore_alloc(info, uid, __FILE__, __LINE__, __PRETTY_FUNCTION__) /*! * \brief Free a data store object |