xine_xmalloc() deprecation: replace its use with static and non-zero size.

The xine_xmalloc() function is going to be deprecated, as its
behaviour is rarely needed as such, and it's thus misused.

With this, almost all uses of xine_xmalloc() with static size (for
instance the value returned by sizeof()) or with a size that is
guaranteed not to be zero (like strlen()+1) are replaced with calls to
either calloc(1, ...) or malloc().

malloc() is used whenever the allocated memory is going to be
immediately overwritten, while calloc() is used in every other case,
as it sets the whole memory area to zero.

--HG--
extra : transplant_source : %8F%98%EC%02%1E%83%F0s%06X%83C%205Y%80%B12%CC%E1

5 files changed, 20 insertions, 20 deletions

diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c
index 042900867..de45cc1a2 100644
--- a/src/combined/ffmpeg/ff_audio_decoder.c
+++ b/src/combined/ffmpeg/ff_audio_decoder.c
@@ -178,7 +178,7 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
           this->context->bit_rate    = audio_header->nAvgBytesPerSec * 8;
       
           if(audio_header->cbSize > 0) {
-            this->context->extradata = xine_xmalloc(audio_header->cbSize);
+            this->context->extradata = malloc(audio_header->cbSize);
             this->context->extradata_size = audio_header->cbSize;
             memcpy( this->context->extradata, 
                     (uint8_t *)audio_header + sizeof(xine_waveformatex),
@@ -203,7 +203,7 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
             this->context->block_align = _X_BE_32(&this->buf[0x18]);
 
             this->context->extradata_size = 5*sizeof(short);
-            this->context->extradata      = xine_xmalloc(this->context->extradata_size);
+            this->context->extradata      = malloc(this->context->extradata_size);
   
             ptr = (short *) this->context->extradata;
   
@@ -276,7 +276,7 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
   
       this->size = 0;
   
-      this->decode_buffer = xine_xmalloc(AVCODEC_MAX_AUDIO_FRAME_SIZE);
+      this->decode_buffer = calloc(1, AVCODEC_MAX_AUDIO_FRAME_SIZE);
   
       return;
     }
@@ -450,7 +450,7 @@ static audio_decoder_t *ff_audio_open_plugin (audio_decoder_class_t *class_gen,
 
   ff_audio_decoder_t *this ;
 
-  this = (ff_audio_decoder_t *) xine_xmalloc (sizeof (ff_audio_decoder_t));
+  this = calloc(1, sizeof (ff_audio_decoder_t));
 
   this->audio_decoder.decode_data         = ff_audio_decode_data;
   this->audio_decoder.reset               = ff_audio_reset;
@@ -486,7 +486,7 @@ void *init_audio_plugin (xine_t *xine, void *data) {
 
   ff_audio_class_t *this ;
 
-  this = (ff_audio_class_t *) xine_xmalloc (sizeof (ff_audio_class_t));
+  this = calloc(1, sizeof (ff_audio_class_t));
 
   this->decoder_class.open_plugin     = ff_audio_open_plugin;
   this->decoder_class.get_identifier  = ff_audio_get_identifier;
diff --git a/src/combined/ffmpeg/ff_dvaudio_decoder.c b/src/combined/ffmpeg/ff_dvaudio_decoder.c
index 4704c1a2a..6a102f627 100644
--- a/src/combined/ffmpeg/ff_dvaudio_decoder.c
+++ b/src/combined/ffmpeg/ff_dvaudio_decoder.c
@@ -251,10 +251,10 @@ static void dvaudio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
     return;
       
   if (buf->decoder_flags & BUF_FLAG_STDHEADER) {
-    this->buf = xine_xmalloc(AUDIOBUFSIZE);
+    this->buf = calloc(1, AUDIOBUFSIZE);
     this->bufsize = AUDIOBUFSIZE;
     this->size = 0;
-    this->decode_buffer = xine_xmalloc(MAXFRAMESIZE);
+    this->decode_buffer = calloc(1, MAXFRAMESIZE);
     
     this->audio_sample_rate = buf->decoder_info[1];
     this->audio_bits = buf->decoder_info[2];
@@ -368,7 +368,7 @@ static audio_decoder_t *dvaudio_open_plugin (audio_decoder_class_t *class_gen, x
 
   dvaudio_decoder_t *this ;
 
-  this = (dvaudio_decoder_t *) xine_xmalloc (sizeof (dvaudio_decoder_t));
+  this = calloc(1, sizeof (dvaudio_decoder_t));
 
   this->audio_decoder.decode_data    = dvaudio_decode_data;
   this->audio_decoder.reset          = dvaudio_reset;
@@ -401,7 +401,7 @@ static void *init_dvaudio_plugin (xine_t *xine, void *data) {
 
   dvaudio_class_t *this ;
 
-  this = (dvaudio_class_t *) xine_xmalloc (sizeof (dvaudio_class_t));
+  this = calloc(1, sizeof (dvaudio_class_t));
 
   this->decoder_class.open_plugin     = dvaudio_open_plugin;
   this->decoder_class.get_identifier  = dvaudio_get_identifier;
diff --git a/src/combined/ffmpeg/ff_mpeg_parser.c b/src/combined/ffmpeg/ff_mpeg_parser.c
index 70901d93b..3c2c2cf48 100644
--- a/src/combined/ffmpeg/ff_mpeg_parser.c
+++ b/src/combined/ffmpeg/ff_mpeg_parser.c
@@ -50,7 +50,7 @@ static const int frame_rate_tab[][2] = {
 
 void mpeg_parser_init (mpeg_parser_t *parser)
 {
-  parser->chunk_buffer = xine_xmalloc(BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE);
+  parser->chunk_buffer = malloc(BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE);
   mpeg_parser_reset(parser);
 }
 
diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c
index 485e84afb..3ea08417e 100644
--- a/src/combined/ffmpeg/ff_video_decoder.c
+++ b/src/combined/ffmpeg/ff_video_decoder.c
@@ -895,7 +895,7 @@ static void ff_handle_preview_buffer (ff_video_decoder_t *this, buf_element_t *b
   if (codec_type == BUF_VIDEO_MPEG) {
     this->is_mpeg12 = 1;
     if ( this->mpeg_parser == NULL ) {
-      this->mpeg_parser = xine_xmalloc(sizeof(mpeg_parser_t));
+      this->mpeg_parser = calloc(1, sizeof(mpeg_parser_t));
       mpeg_parser_init(this->mpeg_parser);
       this->decoder_init_mode = 0;
     }
@@ -950,7 +950,7 @@ static void ff_handle_header_buffer (ff_video_decoder_t *this, buf_element_t *bu
         
         this->context->sub_id = _X_BE_32(&this->buf[30]);
 
-        this->context->slice_offset = xine_xmalloc(sizeof(int)*SLICE_OFFSET_SIZE);
+        this->context->slice_offset = calloc(SLICE_OFFSET_SIZE, sizeof(int));
         this->slice_offset_size = SLICE_OFFSET_SIZE;
 
         this->context->extradata_size = this->size - 26;
@@ -998,8 +998,8 @@ static void ff_handle_special_buffer (ff_video_decoder_t *this, buf_element_t *b
 
     lprintf("BUF_SPECIAL_STSD_ATOM\n");
     this->context->extradata_size = buf->decoder_info[2];
-    this->context->extradata = xine_xmalloc(buf->decoder_info[2] + 
-                                            FF_INPUT_BUFFER_PADDING_SIZE);
+    this->context->extradata = malloc(buf->decoder_info[2] + 
+				      FF_INPUT_BUFFER_PADDING_SIZE);
     memcpy(this->context->extradata, buf->decoder_info_ptr[2],
       buf->decoder_info[2]);
 
@@ -1008,8 +1008,8 @@ static void ff_handle_special_buffer (ff_video_decoder_t *this, buf_element_t *b
     
     lprintf("BUF_SPECIAL_DECODER_CONFIG\n");
     this->context->extradata_size = buf->decoder_info[2];
-    this->context->extradata = xine_xmalloc(buf->decoder_info[2] +
-                                            FF_INPUT_BUFFER_PADDING_SIZE);
+    this->context->extradata = malloc(buf->decoder_info[2] +
+				      FF_INPUT_BUFFER_PADDING_SIZE);
     memcpy(this->context->extradata, buf->decoder_info_ptr[2],
       buf->decoder_info[2]);
       
@@ -1557,7 +1557,7 @@ static video_decoder_t *ff_video_open_plugin (video_decoder_class_t *class_gen,
 
   lprintf ("open_plugin\n");
 
-  this = (ff_video_decoder_t *) xine_xmalloc (sizeof (ff_video_decoder_t));
+  this = calloc(1, sizeof (ff_video_decoder_t));
 
   this->video_decoder.decode_data         = ff_decode_data;
   this->video_decoder.flush               = ff_flush;
@@ -1576,7 +1576,7 @@ static video_decoder_t *ff_video_open_plugin (video_decoder_class_t *class_gen,
   
   this->decoder_ok        = 0;
   this->decoder_init_mode = 1;
-  this->buf               = xine_xmalloc(VIDEOBUFSIZE + FF_INPUT_BUFFER_PADDING_SIZE);
+  this->buf               = calloc(1, VIDEOBUFSIZE + FF_INPUT_BUFFER_PADDING_SIZE);
   this->bufsize           = VIDEOBUFSIZE;
 
   this->is_mpeg12         = 0;
@@ -1614,7 +1614,7 @@ void *init_video_plugin (xine_t *xine, void *data) {
   ff_video_class_t *this;
   config_values_t  *config;
   
-  this = (ff_video_class_t *) xine_xmalloc (sizeof (ff_video_class_t));
+  this = calloc(1, sizeof (ff_video_class_t));
 
   this->decoder_class.open_plugin     = ff_video_open_plugin;
   this->decoder_class.get_identifier  = ff_video_get_identifier;
diff --git a/src/combined/ffmpeg/ffmpeg_encoder.c b/src/combined/ffmpeg/ffmpeg_encoder.c
index 2d1be10a3..84243a56f 100644
--- a/src/combined/ffmpeg/ffmpeg_encoder.c
+++ b/src/combined/ffmpeg/ffmpeg_encoder.c
@@ -78,7 +78,7 @@ int dxr3_encoder_init(dxr3_driver_t *drv)
 
   avcodec_register_all();  
   lprintf("lavc init , version %x\n", avcodec_version());
-  this = xine_xmalloc(sizeof(lavc_data_t));
+  this = calloc(1, sizeof(lavc_data_t));
   if (!this) return 0;
 
   this->encoder_data.type             = ENC_LAVC;