core: Remove incorrect usage of attribute_malloc.

GCC documentation states that when __attribute__((malloc)) is used it
should not return storage which contains any valid pointers.  It
specifically mentions that realloc functions should not have the malloc
attribute, but this also means that complex initializers which could
contain initialized pointers should not use this attribute.

Change-Id: If507f33ffb3ca3b83b702196eb0e8215d27fc7d2

diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 3dfbe61d9061f29f56f539da832153f5ac0506ba..8cb03800ecabadbae6f847f027d595166489d71e 100644 (file)
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -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,

diff --git a/include/asterisk/datastore.h b/include/asterisk/datastore.h
index 8d6516bc16e25aa801f018a9c992fa84a34c9a75..7a7d99be6936bc53d9e9f545cd1b15b60c2821c0 100644 (file)
--- a/include/asterisk/datastore.h
+++ b/include/asterisk/datastore.h
@@ -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);
 

diff --git a/include/asterisk/stringfields.h b/include/asterisk/stringfields.h
index 5ac5e0973379d345ebbadbcedea513938fa046d5..e1ff2fc1d310f8033671d217cd8d741557c0d341 100644 (file)
--- a/include/asterisk/stringfields.h
+++ b/include/asterisk/stringfields.h
@@ -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);
 

diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h
index c00310d3939d9c84d7b1ea14cf4489f6b7eb1d93..bb9aa2a3c7ad07e157b95de9b3a29322e1b2d58c 100644 (file)
--- a/include/asterisk/utils.h
+++ b/include/asterisk/utils.h
@@ -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;
 

diff --git a/main/channel.c b/main/channel.c
index c71d19b81f92fd773cd6b2314257617b8d80282c..2779aa8279b7d77351f8826f6ea3b840b751f634 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -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,

diff --git a/utils/extconf.c b/utils/extconf.c
index 1be739c177f2647c40780d16f80dddaaebe92789..5b3a95be9c4d5ddc77a351f159471490fa15ca4a 100644 (file)
--- a/utils/extconf.c
+++ b/utils/extconf.c
@@ -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;