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, 11 insertions, 11 deletions

diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c
index 139939d8e..1fe2373b4 100644
--- a/src/dxr3/dxr3_decode_spu.c
+++ b/src/dxr3/dxr3_decode_spu.c
@@ -198,7 +198,7 @@ static void *dxr3_spudec_init_plugin(xine_t *xine, void* data)
 {
   dxr3_spudec_class_t *this;
   
-  this = (dxr3_spudec_class_t *)xine_xmalloc(sizeof(dxr3_spudec_class_t));
+  this = calloc(1, sizeof(dxr3_spudec_class_t));
   if (!this) return NULL;
   
   this->spu_decoder_class.open_plugin     = dxr3_spudec_open_plugin;
@@ -221,7 +221,7 @@ static spu_decoder_t *dxr3_spudec_open_plugin(spu_decoder_class_t *class_gen, xi
   if (class->instance) return NULL;
   if (!dxr3_present(stream)) return NULL;
   
-  this = (dxr3_spudec_t *)xine_xmalloc(sizeof(dxr3_spudec_t));
+  this = calloc(1, sizeof(dxr3_spudec_t));
   if (!this) return NULL;
   
   this->spu_decoder.decode_data       = dxr3_spudec_decode_data;
@@ -374,7 +374,7 @@ static void dxr3_spudec_decode_data(spu_decoder_t *this_gen, buf_element_t *buf)
 	  printf("dxr3_decode_spu: DEBUG: allocating new PCI node for hli_s_ptm %d\n", pci.hli.hl_gi.hli_s_ptm);
 	  /* append PCI at the end of the list */
 	  while (node->next) node = node->next;
-	  node->next = (pci_node_t *)xine_xmalloc(sizeof(pci_node_t));
+	  node->next = calloc(1, sizeof(pci_node_t));
 	  node->next->vpts = this->stream->metronom->got_spu_packet(this->stream->metronom, pci.hli.hl_gi.hli_s_ptm);
 	  node->next->next = NULL;
 	  xine_fast_memcpy(&node->next->pci, &pci, sizeof(pci_t));
diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c
index 3f1c273ff..496ef143e 100644
--- a/src/dxr3/dxr3_decode_video.c
+++ b/src/dxr3/dxr3_decode_video.c
@@ -193,7 +193,7 @@ static void *dxr3_init_plugin(xine_t *xine, void *data)
 {
   dxr3_decoder_class_t *this;
   
-  this = (dxr3_decoder_class_t *)xine_xmalloc(sizeof (dxr3_decoder_class_t));
+  this = calloc(1, sizeof (dxr3_decoder_class_t));
   if (!this) return NULL;
   
   this->video_decoder_class.open_plugin     = dxr3_open_plugin;
@@ -220,7 +220,7 @@ static video_decoder_t *dxr3_open_plugin(video_decoder_class_t *class_gen, xine_
   if (class->instance) return NULL;
   if (!dxr3_present(stream)) return NULL;
   
-  this = (dxr3_decoder_t *)xine_xmalloc(sizeof (dxr3_decoder_t));
+  this = calloc(1, sizeof (dxr3_decoder_t));
   if (!this) return NULL;
   
   cfg = stream->xine->config;
diff --git a/src/dxr3/dxr3_mpeg_encoders.c b/src/dxr3/dxr3_mpeg_encoders.c
index 0c59b0b93..0077a465b 100644
--- a/src/dxr3/dxr3_mpeg_encoders.c
+++ b/src/dxr3/dxr3_mpeg_encoders.c
@@ -124,7 +124,7 @@ int dxr3_rte_init(dxr3_driver_t *drv)
     return 0;
   }
   
-  this = xine_xmalloc(sizeof(rte_data_t));
+  this = calloc(1, sizeof(rte_data_t));
   if (!this) return 0;
   
   this->encoder_data.type             = ENC_RTE;
@@ -316,7 +316,7 @@ int dxr3_fame_init(dxr3_driver_t *drv)
 {
   fame_data_t *this;
   
-  this = xine_xmalloc(sizeof(fame_data_t));
+  this = calloc(1, sizeof(fame_data_t));
   if (!this) return 0;
   
   this->encoder_data.type             = ENC_FAME;
diff --git a/src/dxr3/dxr3_scr.c b/src/dxr3/dxr3_scr.c
index 8fb049656..c95ab00a7 100644
--- a/src/dxr3/dxr3_scr.c
+++ b/src/dxr3/dxr3_scr.c
@@ -70,7 +70,7 @@ dxr3_scr_t *dxr3_scr_init(xine_t *xine)
   int devnum;
   char tmpstr[128];
   
-  this = (dxr3_scr_t *)xine_xmalloc(sizeof(dxr3_scr_t));
+  this = calloc(1, sizeof(dxr3_scr_t));
   
   devnum = xine->config->register_num(xine->config,
     CONF_KEY, 0, CONF_NAME, CONF_HELP, 10, NULL, NULL);
diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c
index c51354157..482d094b9 100644
--- a/src/dxr3/video_out_dxr3.c
+++ b/src/dxr3/video_out_dxr3.c
@@ -169,7 +169,7 @@ static dxr3_driver_class_t *dxr3_vo_init_plugin(xine_t *xine, void *visual_gen)
 {
   dxr3_driver_class_t *this;
   
-  this = (dxr3_driver_class_t *)xine_xmalloc(sizeof(dxr3_driver_class_t));
+  this = calloc(1, sizeof(dxr3_driver_class_t));
   if (!this) return NULL;
   
   this->devnum = xine->config->register_num(xine->config,
@@ -232,7 +232,7 @@ static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const v
   
   if (class->instance) return NULL;
   
-  this = (dxr3_driver_t *)xine_xmalloc(sizeof(dxr3_driver_t));
+  this = calloc(1, sizeof(dxr3_driver_t));
   if (!this) return NULL;
   
   this->vo_driver.get_capabilities     = dxr3_get_capabilities;
@@ -536,7 +536,7 @@ static vo_frame_t *dxr3_alloc_frame(vo_driver_t *this_gen)
   dxr3_frame_t *frame;
   dxr3_driver_t *this = (dxr3_driver_t *)this_gen;
   
-  frame = (dxr3_frame_t *)xine_xmalloc(sizeof(dxr3_frame_t));
+  frame = calloc(1, sizeof(dxr3_frame_t));
   
   pthread_mutex_init(&frame->vo_frame.mutex, NULL);