diff options
Diffstat (limited to 'src/xine-utils')
-rw-r--r-- | src/xine-utils/array.h | 2 | ||||
-rw-r--r-- | src/xine-utils/list.c | 2 | ||||
-rw-r--r-- | src/xine-utils/list.h | 2 | ||||
-rw-r--r-- | src/xine-utils/pool.c | 2 | ||||
-rw-r--r-- | src/xine-utils/pool.h | 2 | ||||
-rw-r--r-- | src/xine-utils/ring_buffer.h | 2 | ||||
-rw-r--r-- | src/xine-utils/sorted_array.h | 2 | ||||
-rw-r--r-- | src/xine-utils/xineutils.h | 2 | ||||
-rw-r--r-- | src/xine-utils/xmlparser.c | 3 |
9 files changed, 10 insertions, 9 deletions
diff --git a/src/xine-utils/array.h b/src/xine-utils/array.h index ae2093823..44f3c7632 100644 --- a/src/xine-utils/array.h +++ b/src/xine-utils/array.h @@ -27,7 +27,7 @@ typedef struct xine_array_s xine_array_t; /* Constructor */ -xine_array_t *xine_array_new(size_t initial_size) XINE_PROTECTED; +xine_array_t *xine_array_new(size_t initial_size) XINE_MALLOC XINE_PROTECTED; /* Destructor */ void xine_array_delete(xine_array_t *array) XINE_PROTECTED; diff --git a/src/xine-utils/list.c b/src/xine-utils/list.c index b157bda3f..eb654a3e3 100644 --- a/src/xine-utils/list.c +++ b/src/xine-utils/list.c @@ -67,7 +67,7 @@ struct xine_list_s { /* Allocates a new chunk of n elements * One malloc call is used to allocate the struct and the elements. */ -static xine_list_chunk_t *xine_list_alloc_chunk(size_t size) { +static xine_list_chunk_t *XINE_MALLOC xine_list_alloc_chunk(size_t size) { xine_list_chunk_t *new_chunk; size_t chunk_mem_size; diff --git a/src/xine-utils/list.h b/src/xine-utils/list.h index e00e30d6c..f05ed2b0e 100644 --- a/src/xine-utils/list.h +++ b/src/xine-utils/list.h @@ -48,7 +48,7 @@ typedef struct xine_list_s xine_list_t; typedef void* xine_list_iterator_t; /* Constructor */ -xine_list_t *xine_list_new(void) XINE_PROTECTED; +xine_list_t *xine_list_new(void) XINE_MALLOC XINE_PROTECTED; /* Destructor */ void xine_list_delete(xine_list_t *list) XINE_PROTECTED; diff --git a/src/xine-utils/pool.c b/src/xine-utils/pool.c index a1fddadd9..1b7fd63f3 100644 --- a/src/xine-utils/pool.c +++ b/src/xine-utils/pool.c @@ -55,7 +55,7 @@ struct xine_pool_s { /* Allocates a new chunk of n elements * One malloc call is used to allocate the struct and the elements. */ -static xine_pool_chunk_t *xine_pool_alloc_chunk(size_t object_size, size_t object_count) { +static xine_pool_chunk_t *XINE_MALLOC xine_pool_alloc_chunk(size_t object_size, size_t object_count) { xine_pool_chunk_t *new_chunk; size_t chunk_mem_size;; diff --git a/src/xine-utils/pool.h b/src/xine-utils/pool.h index 918da82a2..2667b7fdc 100644 --- a/src/xine-utils/pool.h +++ b/src/xine-utils/pool.h @@ -36,7 +36,7 @@ xine_pool_t *xine_pool_new(size_t object_size, void (create_object)(void *object), void (prepare_object)(void *object), void (return_object)(void *object), - void (delete_object)(void *object)) XINE_PROTECTED; + void (delete_object)(void *object)) XINE_MALLOC XINE_PROTECTED; /* Deletes a pool */ void xine_pool_delete(xine_pool_t *pool) XINE_PROTECTED; diff --git a/src/xine-utils/ring_buffer.h b/src/xine-utils/ring_buffer.h index efcffd3b7..5f104dc77 100644 --- a/src/xine-utils/ring_buffer.h +++ b/src/xine-utils/ring_buffer.h @@ -22,7 +22,7 @@ typedef struct xine_ring_buffer_s xine_ring_buffer_t; /* Creates a new ring buffer */ -xine_ring_buffer_t *xine_ring_buffer_new(size_t size) XINE_PROTECTED; +xine_ring_buffer_t *xine_ring_buffer_new(size_t size) XINE_MALLOC XINE_PROTECTED; /* Deletes a ring buffer */ void xine_ring_buffer_delete(xine_ring_buffer_t *ring_buffer) XINE_PROTECTED; diff --git a/src/xine-utils/sorted_array.h b/src/xine-utils/sorted_array.h index a1894eca3..c6fdd1c25 100644 --- a/src/xine-utils/sorted_array.h +++ b/src/xine-utils/sorted_array.h @@ -63,7 +63,7 @@ typedef struct xine_sarray_s xine_sarray_t; typedef int (*xine_sarray_comparator_t)(void*, void*); /* Constructor */ -xine_sarray_t *xine_sarray_new(size_t initial_size, xine_sarray_comparator_t comparator) XINE_PROTECTED; +xine_sarray_t *xine_sarray_new(size_t initial_size, xine_sarray_comparator_t comparator) XINE_MALLOC XINE_PROTECTED; /* Destructor */ void xine_sarray_delete(xine_sarray_t *sarray) XINE_PROTECTED; diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h index c3808e3c3..3d630b066 100644 --- a/src/xine-utils/xineutils.h +++ b/src/xine-utils/xineutils.h @@ -956,7 +956,7 @@ void xine_xprintf(xine_t *xine, int verbose, const char *fmt, ...); /** * get encoding of current locale */ -char *xine_get_system_encoding(void) XINE_PROTECTED; +char *xine_get_system_encoding(void) XINE_MALLOC XINE_PROTECTED; /* * guess default encoding for the subtitles diff --git a/src/xine-utils/xmlparser.c b/src/xine-utils/xmlparser.c index 2922135e2..a4917429b 100644 --- a/src/xine-utils/xmlparser.c +++ b/src/xine-utils/xmlparser.c @@ -36,6 +36,7 @@ #include "xineutils.h" #else #define lprintf(...) +#define XINE_MALLOC #endif #include "xmllexer.h" #include "xmlparser.h" @@ -78,7 +79,7 @@ static void free_xml_node(xml_node_t * node) { free(node); } -static xml_property_t * new_xml_property(void) { +static xml_property_t *XINE_MALLOC new_xml_property(void) { xml_property_t * new_property; new_property = (xml_property_t*) malloc(sizeof(xml_property_t)); |