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

13 files changed, 26 insertions, 26 deletions

diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c
index 4ce2b1be3..e68d80a71 100644
--- a/src/audio_out/audio_alsa_out.c
+++ b/src/audio_out/audio_alsa_out.c
@@ -1350,7 +1350,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
   #define A52_PASSTHRU	12
   int speakers;
 
-  this = (alsa_driver_t *) xine_xmalloc (sizeof (alsa_driver_t));
+  this = calloc(1, sizeof (alsa_driver_t));
   if (!this)
     return NULL;
 
@@ -1682,7 +1682,7 @@ static void *init_class (xine_t *xine, void *data) {
 
   alsa_class_t        *this;
 
-  this = (alsa_class_t *) xine_xmalloc (sizeof (alsa_class_t));
+  this = calloc(1, sizeof (alsa_class_t));
   if (!this)
     return NULL;
 
diff --git a/src/audio_out/audio_arts_out.c b/src/audio_out/audio_arts_out.c
index 0f0467b4a..14bf5c965 100644
--- a/src/audio_out/audio_arts_out.c
+++ b/src/audio_out/audio_arts_out.c
@@ -303,7 +303,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
 
   lprintf ("audio_arts_out: open_plugin called\n");
 
-  this = (arts_driver_t *) xine_xmalloc (sizeof (arts_driver_t));
+  this = calloc(1, sizeof (arts_driver_t));
   if (!this)
     return NULL;
 
@@ -384,7 +384,7 @@ static void *init_class (xine_t *xine, void *data) {
 
   lprintf ("audio_arts_out: init class\n");
 
-  this = (arts_class_t *) xine_xmalloc (sizeof (arts_class_t));
+  this = calloc(1, sizeof (arts_class_t));
   if (!this)
     return NULL;
 
diff --git a/src/audio_out/audio_coreaudio_out.c b/src/audio_out/audio_coreaudio_out.c
index eecab8f95..642f920c7 100644
--- a/src/audio_out/audio_coreaudio_out.c
+++ b/src/audio_out/audio_coreaudio_out.c
@@ -530,7 +530,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen,
 
   lprintf ("open_plugin called\n");
 
-  this = (coreaudio_driver_t *) xine_xmalloc (sizeof (coreaudio_driver_t));
+  this = calloc(1, sizeof (coreaudio_driver_t));
   if (!this)
     return NULL;
 
@@ -582,7 +582,7 @@ static void *init_class (xine_t *xine, void *data) {
 
   lprintf ("init class\n");
 
-  this = (coreaudio_class_t *) xine_xmalloc (sizeof (coreaudio_class_t));
+  this = calloc(1, sizeof (coreaudio_class_t));
   if (!this)
     return NULL;
 
diff --git a/src/audio_out/audio_directx2_out.c b/src/audio_out/audio_directx2_out.c
index d9688b647..5fffd1e2d 100644
--- a/src/audio_out/audio_directx2_out.c
+++ b/src/audio_out/audio_directx2_out.c
@@ -955,7 +955,7 @@ static ao_driver_t *open_plugin(audio_driver_class_t *class_gen, const void *dat
 
   lprintf("open plugin called\n");
 
-  this = (dx2_driver_t *)xine_xmalloc(sizeof(dx2_driver_t));
+  this = calloc(1, sizeof(dx2_driver_t));
   if (!this)
     return NULL;
 
@@ -1009,7 +1009,7 @@ static void *init_class(xine_t *xine, void *data) {
 
   lprintf("init class\n");
 
-  this = (dx2_class_t *)xine_xmalloc(sizeof(dx2_class_t));
+  this = calloc(1, sizeof(dx2_class_t));
   if (!this)
     return NULL;
 
diff --git a/src/audio_out/audio_directx_out.c b/src/audio_out/audio_directx_out.c
index 77e3e15b9..7c99e97e2 100644
--- a/src/audio_out/audio_directx_out.c
+++ b/src/audio_out/audio_directx_out.c
@@ -790,7 +790,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
   audiox_class_t  *class = (audiox_class_t *) class_gen;
   ao_directx_t    *ao_directx;
   
-  ao_directx = ( ao_directx_t * ) xine_xmalloc( sizeof( ao_directx_t ) );
+  ao_directx = calloc(1, sizeof(ao_directx_t));
   if (!ao_directx)
     return NULL;
   
@@ -841,7 +841,7 @@ static void *init_class (xine_t *xine, void *data) {
   /*
    * from this point on, nothing should go wrong anymore
    */
-  audiox = (audiox_class_t *) xine_xmalloc (sizeof (audiox_class_t));
+  audiox = calloc(1, sizeof (audiox_class_t));
   if (!audiox)
     return NULL;
   
diff --git a/src/audio_out/audio_esd_out.c b/src/audio_out/audio_esd_out.c
index 4b209bea1..63c54b546 100644
--- a/src/audio_out/audio_esd_out.c
+++ b/src/audio_out/audio_esd_out.c
@@ -521,7 +521,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen,
 
   esd_close(audio_fd);
 
-  this                     = (esd_driver_t *) xine_xmalloc (sizeof (esd_driver_t));
+  this                     = calloc(1, sizeof (esd_driver_t));
   if (!this)
     return NULL;
   this->xine               = class->xine;
@@ -583,7 +583,7 @@ static void *init_class (xine_t *xine, void *data) {
 
   esd_class_t        *this;
 
-  this = (esd_class_t *) xine_xmalloc (sizeof (esd_class_t));
+  this = calloc(1, sizeof (esd_class_t));
   if (!this)
     return NULL;
 
diff --git a/src/audio_out/audio_file_out.c b/src/audio_out/audio_file_out.c
index 225d64d0e..699a5cf54 100644
--- a/src/audio_out/audio_file_out.c
+++ b/src/audio_out/audio_file_out.c
@@ -323,7 +323,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen,
 
 	lprintf ("open_plugin called\n");
 
-	this = (file_driver_t *) xine_xmalloc (sizeof (file_driver_t));
+	this = calloc(1, sizeof (file_driver_t));
 	if (!this)
 		return NULL;
 
@@ -375,7 +375,7 @@ static void *init_class (xine_t *xine, void *data) {
 
 	lprintf ("init class\n");
 
-	this = (file_class_t *) xine_xmalloc (sizeof (file_class_t));
+	this = calloc(1, sizeof (file_class_t));
 	if (!this)
 		return NULL;
 
diff --git a/src/audio_out/audio_fusionsound_out.c b/src/audio_out/audio_fusionsound_out.c
index 92eadc6cf..1480cd6d2 100644
--- a/src/audio_out/audio_fusionsound_out.c
+++ b/src/audio_out/audio_fusionsound_out.c
@@ -393,7 +393,7 @@ static ao_driver_t* open_plugin(audio_driver_class_t *ao_class,
   char                **argp   = (char **) args;
   DFBResult             ret;
 
-  this = (fusionsound_driver_t *) xine_xmalloc (sizeof(fusionsound_driver_t));
+  this = calloc(1, sizeof(fusionsound_driver_t));
   if (!this) {
     xprintf (class->xine, XINE_VERBOSITY_LOG,
              "audio_fusionsound_out: driver interface allocation failed!\n");
@@ -460,7 +460,7 @@ static void* init_class(xine_t *xine, void *data) {
     return NULL;
   }
 
-  class = (fusionsound_class_t *) xine_xmalloc (sizeof( fusionsound_class_t));
+  class = calloc(1, sizeof( fusionsound_class_t));
   if (!class) {
     xprintf (xine, XINE_VERBOSITY_LOG,
              "audio_fusionsound_out: class interface allocation failed!\n");
diff --git a/src/audio_out/audio_jack_out.c b/src/audio_out/audio_jack_out.c
index 1bc070527..070b96df8 100644
--- a/src/audio_out/audio_jack_out.c
+++ b/src/audio_out/audio_jack_out.c
@@ -328,7 +328,7 @@ static ao_driver_t *open_jack_plugin (audio_driver_class_t *class_gen,
 	}
     }
 
-    this = (jack_driver_t *) xine_xmalloc (sizeof (jack_driver_t));
+    this = calloc(1, sizeof (jack_driver_t));
     
     this->client = client;
 
@@ -416,7 +416,7 @@ static void *init_class (xine_t *xine, void *data) {
 
     jack_class_t        *this;
 
-    this = (jack_class_t *) xine_xmalloc (sizeof (jack_class_t));
+    this = calloc(1, sizeof (jack_class_t));
 
     this->driver_class.open_plugin     = open_jack_plugin;
     this->driver_class.get_identifier  = get_identifier;
diff --git a/src/audio_out/audio_none_out.c b/src/audio_out/audio_none_out.c
index a815d645a..9ba9a00ca 100644
--- a/src/audio_out/audio_none_out.c
+++ b/src/audio_out/audio_none_out.c
@@ -186,7 +186,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen,
 
   lprintf ("open_plugin called\n");
 
-  this = (none_driver_t *) xine_xmalloc (sizeof (none_driver_t));
+  this = calloc(1, sizeof (none_driver_t));
   if (!this)
     return NULL;
 
@@ -236,7 +236,7 @@ static void *init_class (xine_t *xine, void *data) {
 
   lprintf ("init class\n");
 
-  this = (none_class_t *) xine_xmalloc (sizeof (none_class_t));
+  this = calloc(1, sizeof (none_class_t));
   if (!this)
     return NULL;
 
diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c
index 40d5bcfdc..8c1e38ea7 100644
--- a/src/audio_out/audio_oss_out.c
+++ b/src/audio_out/audio_oss_out.c
@@ -729,7 +729,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
   int speakers;
 
   
-  this = (oss_driver_t *) xine_xmalloc (sizeof (oss_driver_t));
+  this = calloc(1, sizeof (oss_driver_t));
   if (!this)
     return NULL;
 
@@ -1170,7 +1170,7 @@ static void *init_class (xine_t *xine, void *data) {
 
   oss_class_t        *this;
 
-  this = (oss_class_t *) xine_xmalloc (sizeof (oss_class_t));
+  this = calloc(1, sizeof (oss_class_t));
   if (!this)
     return NULL;
 
diff --git a/src/audio_out/audio_pulse_out.c b/src/audio_out/audio_pulse_out.c
index 5a25db5ff..dfae98c31 100644
--- a/src/audio_out/audio_pulse_out.c
+++ b/src/audio_out/audio_pulse_out.c
@@ -745,7 +745,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
 
   lprintf ("audio_pulse_out: open_plugin called\n");
 
-  this = (pulse_driver_t *) xine_xmalloc (sizeof (pulse_driver_t));
+  this = calloc(1, sizeof (pulse_driver_t));
   if (!this)
     return NULL;
 
@@ -856,7 +856,7 @@ static void *init_class (xine_t *xine, void *data) {
 
   lprintf ("audio_pulse_out: init class\n");
 
-  this = (pulse_class_t *) xine_xmalloc (sizeof (pulse_class_t));
+  this = calloc(1, sizeof (pulse_class_t));
   if (!this)
     return NULL;
 
diff --git a/src/audio_out/audio_sun_out.c b/src/audio_out/audio_sun_out.c
index b23955b77..048db6b86 100644
--- a/src/audio_out/audio_sun_out.c
+++ b/src/audio_out/audio_sun_out.c
@@ -909,7 +909,7 @@ static ao_driver_t *ao_sun_open_plugin (audio_driver_class_t *class_gen, const v
   int                  status;
   audio_info_t	       info;
 
-  this = (sun_driver_t *) xine_xmalloc (sizeof (sun_driver_t));
+  this = calloc(1, sizeof (sun_driver_t));
   if (!this)
     return NULL;
 
@@ -1032,7 +1032,7 @@ static void ao_sun_dispose_class (audio_driver_class_t *this_gen) {
 static void *ao_sun_init_class (xine_t *xine, void *data) {
   sun_class_t         *this;
 
-  this = (sun_class_t *) xine_xmalloc (sizeof (sun_class_t));
+  this = calloc(1, sizeof (sun_class_t));
   if (!this)
     return NULL;