Menu
▾
▴
[xine-cvs] HG: xine-lib: Mark initialisation functions with malloc attribute.
|
From: Diego 'F. P. <fla...@gm...> - 2008-05-23 18:07:32
|
# HG changeset patch
# User Diego 'Flameeyes' Pettenò <fla...@gm...>
# Date 1211566020 -7200
# Node ID 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6
# Parent a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8
Mark initialisation functions with malloc attribute.
All the initialisation functions returning a new object instance that
was allocated through malloc() or calloc() can get the malloc
attribute so that the compiler can optimise their call.
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/demuxers/asfheader.h
--- a/src/demuxers/asfheader.h Fri May 23 20:07:00 2008 +0200
+++ b/src/demuxers/asfheader.h Tue May 20 21:17:16 2008 +0200
@@ -389,7 +389,7 @@ int asf_find_object_id (GUID *g);
int asf_find_object_id (GUID *g);
void asf_get_guid (uint8_t *buffer, GUID *value);
-asf_header_t *asf_header_new (uint8_t *buffer, int buffer_len);
+asf_header_t *asf_header_new (uint8_t *buffer, int buffer_len) XINE_MALLOC;
void asf_header_choose_streams (asf_header_t *header, uint32_t bandwidth,
int *video_id, int *audio_id);
void asf_header_disable_streams (asf_header_t *header,
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/demuxers/demux_avi.c
--- a/src/demuxers/demux_avi.c Fri May 23 20:07:00 2008 +0200
+++ b/src/demuxers/demux_avi.c Tue May 20 21:17:16 2008 +0200
@@ -719,7 +719,7 @@ static void reset_idx(demux_avi_t *this,
}
}
-static avi_t *AVI_init(demux_avi_t *this) {
+static avi_t *XINE_MALLOC AVI_init(demux_avi_t *this) {
avi_t *AVI;
int i, j, idx_type;
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/demuxers/demux_mpgaudio.c
--- a/src/demuxers/demux_mpgaudio.c Fri May 23 20:07:00 2008 +0200
+++ b/src/demuxers/demux_mpgaudio.c Tue May 20 21:17:16 2008 +0200
@@ -316,8 +316,8 @@ static int parse_frame_header(mpg_audio_
* Parse a Xing header
* return the Xing header or NULL on error
*/
-static xing_header_t* parse_xing_header(mpg_audio_frame_t *frame,
- uint8_t *buf, int bufsize) {
+static xing_header_t *XINE_MALLOC parse_xing_header(mpg_audio_frame_t *frame,
+ uint8_t *buf, int bufsize) {
uint8_t *ptr = buf;
xing_header_t *xing = NULL;
@@ -420,8 +420,8 @@ exit_error:
* Parse a Vbri header
* return the Vbri header or NULL on error
*/
-static vbri_header_t* parse_vbri_header(mpg_audio_frame_t *frame,
- uint8_t *buf, int bufsize) {
+static vbri_header_t *XINE_MALLOC parse_vbri_header(mpg_audio_frame_t *frame,
+ uint8_t *buf, int bufsize) {
int i;
uint8_t *ptr = buf;
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/demuxers/ebml.h
--- a/src/demuxers/ebml.h Fri May 23 20:07:00 2008 +0200
+++ b/src/demuxers/ebml.h Tue May 20 21:17:16 2008 +0200
@@ -65,7 +65,7 @@ typedef struct ebml_parser_s {
} ebml_parser_t;
-ebml_parser_t *new_ebml_parser (xine_t *xine, input_plugin_t *input);
+ebml_parser_t *new_ebml_parser (xine_t *xine, input_plugin_t *input) XINE_MALLOC;
void dispose_ebml_parser (ebml_parser_t *ebml);
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/input/input_dvb.c
--- a/src/input/input_dvb.c Fri May 23 20:07:00 2008 +0200
+++ b/src/input/input_dvb.c Tue May 20 21:17:16 2008 +0200
@@ -571,7 +571,7 @@ static void tuner_dispose(tuner_t * this
}
-static tuner_t *tuner_init(xine_t * xine, int adapter)
+static tuner_t *XINE_MALLOC tuner_init(xine_t * xine, int adapter)
{
tuner_t *this;
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/input/input_pvr.c
--- a/src/input/input_pvr.c Fri May 23 20:07:00 2008 +0200
+++ b/src/input/input_pvr.c Tue May 20 21:17:16 2008 +0200
@@ -376,7 +376,7 @@ static void pvrscr_exit (scr_plugin_t *s
free(this);
}
-static pvrscr_t* pvrscr_init (void) {
+static pvrscr_t *XINE_MALLOC pvrscr_init (void) {
pvrscr_t *this;
this = calloc(1, sizeof(pvrscr_t));
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/input/input_v4l.c
--- a/src/input/input_v4l.c Fri May 23 20:07:00 2008 +0200
+++ b/src/input/input_v4l.c Tue May 20 21:17:16 2008 +0200
@@ -349,7 +349,7 @@ static void pvrscr_exit (scr_plugin_t *s
free(this);
}
-static pvrscr_t* pvrscr_init (void)
+static pvrscr_t *XINE_MALLOC pvrscr_init (void)
{
pvrscr_t *this;
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/input/libreal/asmrp.c
--- a/src/input/libreal/asmrp.c Fri May 23 20:07:00 2008 +0200
+++ b/src/input/libreal/asmrp.c Tue May 20 21:17:16 2008 +0200
@@ -95,7 +95,7 @@ typedef struct {
} asmrp_t;
-static asmrp_t *asmrp_new () {
+static asmrp_t *XINE_MALLOC asmrp_new () {
asmrp_t *p;
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/input/libreal/rmff.h
--- a/src/input/libreal/rmff.h Fri May 23 20:07:00 2008 +0200
+++ b/src/input/libreal/rmff.h Tue May 20 21:17:16 2008 +0200
@@ -32,10 +32,10 @@
#include <string.h>
#include <inttypes.h>
-
#ifndef HAVE_RMFF_H
#define HAVE_RMFF_H
+#include "attributes.h"
#define RMFF_HEADER_SIZE 0x12
@@ -220,7 +220,7 @@ rmff_data_t *rmff_new_dataheader(
/*
* reads header infos from data and returns a newly allocated header struct
*/
-rmff_header_t *rmff_scan_header(const char *data);
+rmff_header_t *rmff_scan_header(const char *data) XINE_MALLOC;
/*
* scans a data packet header. Notice, that this function does not allocate
@@ -231,7 +231,7 @@ void rmff_scan_pheader(rmff_pheader_t *h
/*
* reads header infos from stream and returns a newly allocated header struct
*/
-rmff_header_t *rmff_scan_header_stream(int fd);
+rmff_header_t *rmff_scan_header_stream(int fd) XINE_MALLOC;
/*
* prints header information in human readible form to stdout
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/input/libreal/sdpplin.c
--- a/src/input/libreal/sdpplin.c Fri May 23 20:07:00 2008 +0200
+++ b/src/input/libreal/sdpplin.c Tue May 20 21:17:16 2008 +0200
@@ -120,7 +120,7 @@ static int filter(const char *in, const
return 0;
}
-static sdpplin_stream_t *sdpplin_parse_stream(char **data) {
+static sdpplin_stream_t *XINE_MALLOC sdpplin_parse_stream(char **data) {
sdpplin_stream_t *desc = calloc(1, sizeof(sdpplin_stream_t));
char *buf=xine_buffer_init(32);
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/input/libreal/sdpplin.h
--- a/src/input/libreal/sdpplin.h Fri May 23 20:07:00 2008 +0200
+++ b/src/input/libreal/sdpplin.h Tue May 20 21:17:16 2008 +0200
@@ -101,7 +101,7 @@ typedef struct {
} sdpplin_t;
-sdpplin_t *sdpplin_parse(char *data);
+sdpplin_t *sdpplin_parse(char *data) XINE_MALLOC;
void sdpplin_free(sdpplin_t *description);
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/input/librtsp/rtsp.h
--- a/src/input/librtsp/rtsp.h Fri May 23 20:07:00 2008 +0200
+++ b/src/input/librtsp/rtsp.h Tue May 20 21:17:16 2008 +0200
@@ -40,7 +40,7 @@
typedef struct rtsp_s rtsp_t;
-rtsp_t* rtsp_connect (xine_stream_t *stream, const char *mrl, const char *user_agent);
+rtsp_t* rtsp_connect (xine_stream_t *stream, const char *mrl, const char *user_agent) XINE_MALLOC;
int rtsp_request_options(rtsp_t *s, const char *what);
int rtsp_request_describe(rtsp_t *s, const char *what);
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/input/librtsp/rtsp_session.h
--- a/src/input/librtsp/rtsp_session.h Fri May 23 20:07:00 2008 +0200
+++ b/src/input/librtsp/rtsp_session.h Tue May 20 21:17:16 2008 +0200
@@ -25,7 +25,7 @@
typedef struct rtsp_session_s rtsp_session_t;
-rtsp_session_t *rtsp_session_start(xine_stream_t *stream, char *mrl);
+rtsp_session_t *rtsp_session_start(xine_stream_t *stream, char *mrl) XINE_MALLOC;
void rtsp_session_set_start_time(rtsp_session_t *this, int start_time);
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/input/net_buf_ctrl.h
--- a/src/input/net_buf_ctrl.h Fri May 23 20:07:00 2008 +0200
+++ b/src/input/net_buf_ctrl.h Tue May 20 21:17:16 2008 +0200
@@ -27,7 +27,7 @@
typedef struct nbc_s nbc_t;
-nbc_t *nbc_init (xine_stream_t *xine);
+nbc_t *nbc_init (xine_stream_t *xine) XINE_MALLOC;
void nbc_check_buffers (nbc_t *this);
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/post/audio/stretch.c
--- a/src/post/audio/stretch.c Fri May 23 20:07:00 2008 +0200
+++ b/src/post/audio/stretch.c Tue May 20 21:17:16 2008 +0200
@@ -152,7 +152,7 @@ static void stretchscr_exit (scr_plugin_
free(this);
}
-static stretchscr_t* stretchscr_init (double *stretch_factor) {
+static stretchscr_t *XINE_MALLOC stretchscr_init (double *stretch_factor) {
stretchscr_t *this;
this = calloc(1, sizeof(stretchscr_t));
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/xine-engine/audio_out.c
--- a/src/xine-engine/audio_out.c Fri May 23 20:07:00 2008 +0200
+++ b/src/xine-engine/audio_out.c Tue May 20 21:17:16 2008 +0200
@@ -290,7 +290,7 @@ static int ao_get_property (xine_audio_p
static int ao_get_property (xine_audio_port_t *this_gen, int property);
static int ao_set_property (xine_audio_port_t *this_gen, int property, int value);
-static audio_fifo_t *fifo_new (xine_t *xine) {
+static audio_fifo_t *XINE_MALLOC fifo_new (xine_t *xine) {
audio_fifo_t *fifo;
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/xine-engine/audio_out.h
--- a/src/xine-engine/audio_out.h Fri May 23 20:07:00 2008 +0200
+++ b/src/xine-engine/audio_out.h Tue May 20 21:17:16 2008 +0200
@@ -259,7 +259,7 @@ struct audio_driver_class_s {
* this initiates the audio_out sync routines
* found in ./src/xine-engine/audio_out.c
*/
-xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_driver_t *driver, int grab_only) XINE_PROTECTED;
+xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_driver_t *driver, int grab_only) XINE_MALLOC XINE_PROTECTED;
/*
* audio output modes + capabilities
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/xine-engine/broadcaster.h
--- a/src/xine-engine/broadcaster.h Fri May 23 20:07:00 2008 +0200
+++ b/src/xine-engine/broadcaster.h Tue May 20 21:17:16 2008 +0200
@@ -33,7 +33,7 @@ extern "C" {
typedef struct broadcaster_s broadcaster_t;
-broadcaster_t *_x_init_broadcaster(xine_stream_t *stream, int port) XINE_PROTECTED;
+broadcaster_t *_x_init_broadcaster(xine_stream_t *stream, int port) XINE_MALLOC XINE_PROTECTED;
void _x_close_broadcaster(broadcaster_t *this) XINE_PROTECTED;
int _x_get_broadcaster_port(broadcaster_t *this) XINE_PROTECTED;
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/xine-engine/buffer.h
--- a/src/xine-engine/buffer.h Fri May 23 20:07:00 2008 +0200
+++ b/src/xine-engine/buffer.h Tue May 20 21:17:16 2008 +0200
@@ -607,8 +607,8 @@ struct fifo_buffer_s
* allocate num_buffers of buf_size bytes each
*/
-fifo_buffer_t *_x_fifo_buffer_new (int num_buffers, uint32_t buf_size) XINE_PROTECTED;
-fifo_buffer_t *_x_dummy_fifo_buffer_new (int num_buffers, uint32_t buf_size) XINE_PROTECTED;
+fifo_buffer_t *_x_fifo_buffer_new (int num_buffers, uint32_t buf_size) XINE_MALLOC XINE_PROTECTED;
+fifo_buffer_t *_x_dummy_fifo_buffer_new (int num_buffers, uint32_t buf_size) XINE_MALLOC XINE_PROTECTED;
/* return BUF_VIDEO_xxx given the fourcc
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/xine-engine/configfile.c
--- a/src/xine-engine/configfile.c Fri May 23 20:07:00 2008 +0200
+++ b/src/xine-engine/configfile.c Tue May 20 21:17:16 2008 +0200
@@ -319,7 +319,7 @@ static void config_insert(config_values_
this->first = new_entry;
}
-static cfg_entry_t *config_add (config_values_t *this, const char *key, int exp_level) {
+static cfg_entry_t *XINE_MALLOC config_add (config_values_t *this, const char *key, int exp_level) {
cfg_entry_t *entry;
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/xine-engine/configfile.h
--- a/src/xine-engine/configfile.h Fri May 23 20:07:00 2008 +0200
+++ b/src/xine-engine/configfile.h Tue May 20 21:17:16 2008 +0200
@@ -200,7 +200,7 @@ struct config_values_s {
/*
* allocate and init a new xine config object
*/
-config_values_t *_x_config_init (void) XINE_PROTECTED;
+config_values_t *_x_config_init (void) XINE_MALLOC XINE_PROTECTED;
/*
* interpret stream_setup part of mrls for config value changes
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/xine-engine/load_plugins.c
--- a/src/xine-engine/load_plugins.c Fri May 23 20:07:00 2008 +0200
+++ b/src/xine-engine/load_plugins.c Tue May 20 21:17:16 2008 +0200
@@ -461,7 +461,7 @@ static int _plugin_node_comparator(void
}
}
-static plugin_catalog_t *_new_catalog(void){
+static plugin_catalog_t *XINE_MALLOC _new_catalog(void){
plugin_catalog_t *catalog;
int i;
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/xine-engine/metronom.c
--- a/src/xine-engine/metronom.c Fri May 23 20:07:00 2008 +0200
+++ b/src/xine-engine/metronom.c Tue May 20 21:17:16 2008 +0200
@@ -172,7 +172,7 @@ static void unixscr_exit (scr_plugin_t *
free(this);
}
-static scr_plugin_t* unixscr_init () {
+static scr_plugin_t *XINE_MALLOC unixscr_init () {
unixscr_t *this;
this = calloc(1, sizeof(unixscr_t));
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/xine-engine/metronom.h
--- a/src/xine-engine/metronom.h Fri May 23 20:07:00 2008 +0200
+++ b/src/xine-engine/metronom.h Tue May 20 21:17:16 2008 +0200
@@ -223,7 +223,7 @@ struct metronom_s {
#define METRONOM_VPTS_OFFSET 6
#define METRONOM_PREBUFFER 7
-metronom_t *_x_metronom_init (int have_video, int have_audio, xine_t *xine) XINE_PROTECTED;
+metronom_t *_x_metronom_init (int have_video, int have_audio, xine_t *xine) XINE_MALLOC XINE_PROTECTED;
/* FIXME: reorder this structure on the next cleanup to remove the dummies */
struct metronom_clock_s {
@@ -319,7 +319,7 @@ struct metronom_clock_s {
#endif
};
-metronom_clock_t *_x_metronom_clock_init(xine_t *xine) XINE_PROTECTED;
+metronom_clock_t *_x_metronom_clock_init(xine_t *xine) XINE_MALLOC XINE_PROTECTED;
/*
* clock options
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/xine-engine/osd.c
--- a/src/xine-engine/osd.c Fri May 23 20:07:00 2008 +0200
+++ b/src/xine-engine/osd.c Tue May 20 21:17:16 2008 +0200
@@ -143,7 +143,7 @@ struct osd_ft2context_s {
* for the sake of simplicity)
*/
-static osd_object_t *osd_new_object (osd_renderer_t *this, int width, int height) {
+static osd_object_t *XINE_MALLOC osd_new_object (osd_renderer_t *this, int width, int height) {
osd_object_t *osd;
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/xine-engine/osd.h
--- a/src/xine-engine/osd.h Fri May 23 20:07:00 2008 +0200
+++ b/src/xine-engine/osd.h Tue May 20 21:17:16 2008 +0200
@@ -226,7 +226,7 @@ struct osd_renderer_s {
/*
* initialize the osd rendering engine
*/
-osd_renderer_t *_x_osd_renderer_init( xine_stream_t *stream );
+osd_renderer_t *_x_osd_renderer_init( xine_stream_t *stream ) XINE_MALLOC;
/*
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/xine-engine/refcounter.h
--- a/src/xine-engine/refcounter.h Fri May 23 20:07:00 2008 +0200
+++ b/src/xine-engine/refcounter.h Tue May 20 21:17:16 2008 +0200
@@ -35,7 +35,7 @@ typedef struct {
typedef void (*refcounter_destructor)(void*);
-refcounter_t* _x_new_refcounter(void *object, refcounter_destructor destructor) XINE_PROTECTED;
+refcounter_t* _x_new_refcounter(void *object, refcounter_destructor destructor) XINE_MALLOC XINE_PROTECTED;
int _x_refcounter_inc(refcounter_t *refcounter) XINE_PROTECTED;
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/xine-engine/scratch.h
--- a/src/xine-engine/scratch.h Fri May 23 20:07:00 2008 +0200
+++ b/src/xine-engine/scratch.h Tue May 20 21:17:16 2008 +0200
@@ -51,6 +51,6 @@ struct scratch_buffer_s {
pthread_mutex_t lock;
};
-scratch_buffer_t *_x_new_scratch_buffer (int num_lines) XINE_PROTECTED;
+scratch_buffer_t *_x_new_scratch_buffer (int num_lines) XINE_MALLOC XINE_PROTECTED;
#endif
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/xine-engine/video_out.c
--- a/src/xine-engine/video_out.c Fri May 23 20:07:00 2008 +0200
+++ b/src/xine-engine/video_out.c Tue May 20 21:17:16 2008 +0200
@@ -139,7 +139,7 @@ typedef struct {
* frame queue (fifo) util functions
*/
-static img_buf_fifo_t *vo_new_img_buf_queue () {
+static img_buf_fifo_t *XINE_MALLOC vo_new_img_buf_queue () {
img_buf_fifo_t *queue;
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/xine-engine/video_out.h
--- a/src/xine-engine/video_out.h Fri May 23 20:07:00 2008 +0200
+++ b/src/xine-engine/video_out.h Tue May 20 21:17:16 2008 +0200
@@ -448,7 +448,7 @@ struct video_overlay_manager_s {
* build a video_out_port from
* a given video driver
*/
-xine_video_port_t *_x_vo_new_port (xine_t *xine, vo_driver_t *driver, int grabonly) XINE_PROTECTED;
+xine_video_port_t *_x_vo_new_port (xine_t *xine, vo_driver_t *driver, int grabonly) XINE_MALLOC XINE_PROTECTED;
#ifdef __cplusplus
}
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/xine-engine/video_overlay.h
--- a/src/xine-engine/video_overlay.h Fri May 23 20:07:00 2008 +0200
+++ b/src/xine-engine/video_overlay.h Tue May 20 21:17:16 2008 +0200
@@ -98,6 +98,6 @@ typedef struct video_overlay_event_s {
video_overlay_object_t object; /* The image data. */
} video_overlay_event_t;
-video_overlay_manager_t *_x_video_overlay_new_manager(xine_t *) XINE_PROTECTED;
+video_overlay_manager_t *_x_video_overlay_new_manager(xine_t *) XINE_MALLOC XINE_PROTECTED;
#endif
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/xine-engine/xine.c
--- a/src/xine-engine/xine.c Fri May 23 20:07:00 2008 +0200
+++ b/src/xine-engine/xine.c Tue May 20 21:17:16 2008 +0200
@@ -304,7 +304,7 @@ static void ticket_dispose(xine_ticket_t
free(this);
}
-static xine_ticket_t *ticket_init(void) {
+static xine_ticket_t *XINE_MALLOC ticket_init(void) {
xine_ticket_t *port_ticket;
port_ticket = calloc(1, sizeof(xine_ticket_t));
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/xine-engine/xine_internal.h
--- a/src/xine-engine/xine_internal.h Fri May 23 20:07:00 2008 +0200
+++ b/src/xine-engine/xine_internal.h Tue May 20 21:17:16 2008 +0200
@@ -389,8 +389,8 @@ demux_plugin_t *_x_find_demux_plugin (xi
demux_plugin_t *_x_find_demux_plugin (xine_stream_t *stream, input_plugin_t *input) XINE_PROTECTED;
demux_plugin_t *_x_find_demux_plugin_by_name (xine_stream_t *stream, const char *name, input_plugin_t *input) XINE_PROTECTED;
demux_plugin_t *_x_find_demux_plugin_last_probe(xine_stream_t *stream, const char *last_demux_name, input_plugin_t *input) XINE_PROTECTED;
-input_plugin_t *_x_rip_plugin_get_instance (xine_stream_t *stream, const char *filename) XINE_PROTECTED;
-input_plugin_t *_x_cache_plugin_get_instance (xine_stream_t *stream, int readahead_size) XINE_PROTECTED;
+input_plugin_t *_x_rip_plugin_get_instance (xine_stream_t *stream, const char *filename) XINE_MALLOC XINE_PROTECTED;
+input_plugin_t *_x_cache_plugin_get_instance (xine_stream_t *stream, int readahead_size) XINE_MALLOC XINE_PROTECTED;
void _x_free_input_plugin (xine_stream_t *stream, input_plugin_t *input) XINE_PROTECTED;
void _x_free_demux_plugin (xine_stream_t *stream, demux_plugin_t *demux) XINE_PROTECTED;
diff -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/xine-utils/array.h
--- a/src/xine-utils/array.h Fri May 23 20:07:00 2008 +0200
+++ b/src/xine-utils/array.h Tue May 20 21:17:16 2008 +0200
@@ -27,7 +27,7 @@ typedef struct xine_array_s xine_array_t
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 -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/xine-utils/list.c
--- a/src/xine-utils/list.c Fri May 23 20:07:00 2008 +0200
+++ b/src/xine-utils/list.c Tue May 20 21:17:16 2008 +0200
@@ -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 -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/xine-utils/list.h
--- a/src/xine-utils/list.h Fri May 23 20:07:00 2008 +0200
+++ b/src/xine-utils/list.h Tue May 20 21:17:16 2008 +0200
@@ -48,7 +48,7 @@ typedef void* xine_list_iterator_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 -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/xine-utils/pool.c
--- a/src/xine-utils/pool.c Fri May 23 20:07:00 2008 +0200
+++ b/src/xine-utils/pool.c Tue May 20 21:17:16 2008 +0200
@@ -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 -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/xine-utils/pool.h
--- a/src/xine-utils/pool.h Fri May 23 20:07:00 2008 +0200
+++ b/src/xine-utils/pool.h Tue May 20 21:17:16 2008 +0200
@@ -36,7 +36,7 @@ xine_pool_t *xine_pool_new(size_t object
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 -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/xine-utils/ring_buffer.h
--- a/src/xine-utils/ring_buffer.h Fri May 23 20:07:00 2008 +0200
+++ b/src/xine-utils/ring_buffer.h Tue May 20 21:17:16 2008 +0200
@@ -22,7 +22,7 @@ typedef struct xine_ring_buffer_s xine_r
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 -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/xine-utils/sorted_array.h
--- a/src/xine-utils/sorted_array.h Fri May 23 20:07:00 2008 +0200
+++ b/src/xine-utils/sorted_array.h Tue May 20 21:17:16 2008 +0200
@@ -63,7 +63,7 @@ typedef int (*xine_sarray_comparator_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 -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/xine-utils/xineutils.h
--- a/src/xine-utils/xineutils.h Fri May 23 20:07:00 2008 +0200
+++ b/src/xine-utils/xineutils.h Tue May 20 21:17:16 2008 +0200
@@ -956,7 +956,7 @@ void xine_xprintf(xine_t *xine, int verb
/**
* 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 -r 1270b0ec4c59bd555a3ce5707cc590ea0aa676e6 -r a0dd4f31e7a35f7eecb283ac14a6e5f77299a9b8 src/xine-utils/xmlparser.c
--- a/src/xine-utils/xmlparser.c Fri May 23 20:07:00 2008 +0200
+++ b/src/xine-utils/xmlparser.c Tue May 20 21:17:16 2008 +0200
@@ -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 * n
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));
|