Merge "core: Remove incorrect usage of attribute_malloc."
This commit is contained in:
commit
1a9ed413a1
|
@ -1149,7 +1149,7 @@ enum ama_flags {
|
|||
* \deprecated You should use the ast_datastore_alloc() generic function instead.
|
||||
* \version 1.6.1 deprecated
|
||||
*/
|
||||
struct ast_datastore * attribute_malloc ast_channel_datastore_alloc(const struct ast_datastore_info *info, const char *uid)
|
||||
struct ast_datastore *ast_channel_datastore_alloc(const struct ast_datastore_info *info, const char *uid)
|
||||
__attribute__((deprecated));
|
||||
|
||||
/*!
|
||||
|
@ -1208,7 +1208,7 @@ struct ast_datastore *ast_channel_datastore_find(struct ast_channel *chan, const
|
|||
* and "default" context.
|
||||
* \note Since 12.0.0 this function returns with the newly created channel locked.
|
||||
*/
|
||||
struct ast_channel * attribute_malloc __attribute__((format(printf, 15, 16)))
|
||||
struct ast_channel * __attribute__((format(printf, 15, 16)))
|
||||
__ast_channel_alloc(int needqueue, int state, const char *cid_num,
|
||||
const char *cid_name, const char *acctcode,
|
||||
const char *exten, const char *context, const struct ast_assigned_ids *assignedids,
|
||||
|
|
|
@ -82,7 +82,7 @@ struct ast_datastore {
|
|||
* \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(
|
||||
struct ast_datastore *__ast_datastore_alloc(
|
||||
const struct ast_datastore_info *info, const char *uid, struct ast_module *mod,
|
||||
const char *file, int line, const char *function);
|
||||
|
||||
|
|
|
@ -434,7 +434,7 @@ int __ast_string_field_init(struct ast_string_field_mgr *mgr, struct ast_string_
|
|||
* \internal
|
||||
* \brief internal version of ast_calloc_with_stringfields
|
||||
*/
|
||||
void * attribute_malloc __ast_calloc_with_stringfields(unsigned int num_structs,
|
||||
void *__ast_calloc_with_stringfields(unsigned int num_structs,
|
||||
size_t struct_size, size_t field_mgr_offset, size_t field_mgr_pool_offset, size_t pool_size,
|
||||
const char *file, int lineno, const char *func);
|
||||
|
||||
|
|
|
@ -617,7 +617,7 @@ void * attribute_malloc __ast_calloc_cache(size_t num, size_t len, const char *f
|
|||
)
|
||||
|
||||
AST_INLINE_API(
|
||||
void * attribute_malloc __ast_realloc(void *p, size_t len, const char *file, int lineno, const char *func),
|
||||
void *__ast_realloc(void *p, size_t len, const char *file, int lineno, const char *func),
|
||||
{
|
||||
void *newp;
|
||||
|
||||
|
|
|
@ -782,7 +782,7 @@ static int does_id_conflict(const char *uniqueid)
|
|||
}
|
||||
|
||||
/*! \brief Create a new channel structure */
|
||||
static struct ast_channel * attribute_malloc __attribute__((format(printf, 15, 0)))
|
||||
static struct ast_channel *__attribute__((format(printf, 15, 0)))
|
||||
__ast_channel_alloc_ap(int needqueue, int state, const char *cid_num, const char *cid_name,
|
||||
const char *acctcode, const char *exten, const char *context, const struct ast_assigned_ids *assignedids,
|
||||
const struct ast_channel *requestor, enum ama_flags amaflag, struct ast_endpoint *endpoint,
|
||||
|
|
|
@ -780,7 +780,7 @@ void * attribute_malloc __ast_calloc(size_t num, size_t len, const char *file, i
|
|||
__ast_realloc((p), (len), __FILE__, __LINE__, __PRETTY_FUNCTION__)
|
||||
|
||||
AST_INLINE_API(
|
||||
void * attribute_malloc __ast_realloc(void *p, size_t len, const char *file, int lineno, const char *func),
|
||||
void *__ast_realloc(void *p, size_t len, const char *file, int lineno, const char *func),
|
||||
{
|
||||
void *newp;
|
||||
|
||||
|
|
Loading…
Reference in New Issue