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

23 files changed, 75 insertions, 78 deletions

diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index f43f79fc3..30b9b49e1 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -370,7 +370,7 @@ static cdrom_toc * init_cdrom_toc(void) {
 
   cdrom_toc *toc;
 
-  toc = (cdrom_toc *) xine_xmalloc(sizeof (cdrom_toc));
+  toc = calloc(1, sizeof (cdrom_toc));
   toc->first_track = toc->last_track = toc->total_tracks = 0;
   toc->toc_entries = NULL;
 
@@ -2536,7 +2536,7 @@ static char ** cdda_class_get_autoplay_list (input_class_t *this_gen,
      * device we are going to open; but it is possible that this function
      * gets called, before a plugin instance has been created;
      * let's create a dummy instance in such a condition */
-    ip = (cdda_input_plugin_t *)xine_xmalloc(sizeof(cdda_input_plugin_t));
+    ip = calloc(1, sizeof(cdda_input_plugin_t));
     ip->stream = NULL;
     ip->fd = -1;
     ip->net_fd = -1;
@@ -2637,7 +2637,7 @@ static input_plugin_t *cdda_class_get_instance (input_class_t *cls_gen, xine_str
   } else
     return NULL;
 
-  this = (cdda_input_plugin_t *) xine_xmalloc (sizeof (cdda_input_plugin_t));
+  this = calloc(1, sizeof (cdda_input_plugin_t));
   
   class->ip = this;
   this->stream      = stream;
@@ -2726,7 +2726,7 @@ static void *init_plugin (xine_t *xine, void *data) {
   cdda_input_class_t  *this;
   config_values_t     *config;
 
-  this = (cdda_input_class_t *) xine_xmalloc (sizeof (cdda_input_class_t));
+  this = calloc(1, sizeof (cdda_input_class_t));
 
   this->xine   = xine;
   this->config = xine->config;
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index 795b843c5..0ec81026b 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -513,7 +513,7 @@ time_t dvb_mjdtime (char *buf)
   int i;
   unsigned int year, month, day, hour, min, sec;
   unsigned long int mjd;
-  struct tm *tma = xine_xmalloc(sizeof(struct tm));
+  struct tm *tma = calloc(1, sizeof(struct tm));
   time_t t;
 
   _x_assert(tma != NULL);
@@ -577,11 +577,11 @@ static tuner_t *tuner_init(xine_t * xine, int adapter)
     tuner_t *this;
     int x;
     int test_video;
-    char *video_device=xine_xmalloc(200);
+    char *video_device=malloc(100);
 
     _x_assert(video_device != NULL);
     
-    this = (tuner_t *) xine_xmalloc(sizeof(tuner_t));
+    this = calloc(1, sizeof(tuner_t));
 
     _x_assert(this != NULL);
 
@@ -922,7 +922,7 @@ static channel_t *load_channels(xine_t *xine, xine_stream_t *stream, int *num_ch
 	continue;
 
     if (num_channels >= num_alloc) {
-      channel_t *new_channels = xine_xmalloc((num_alloc += 32) * sizeof (channel_t));
+      channel_t *new_channels = calloc((num_alloc += 32), sizeof (channel_t));
       _x_assert(new_channels != NULL);
       memcpy(new_channels, channels, num_channels * sizeof (channel_t));
       free(channels);
@@ -1229,7 +1229,7 @@ static void dvb_parse_si(dvb_input_plugin_t *this) {
   struct pollfd pfd;
   
   tuner_t *tuner = this->tuner;
-  tmpbuffer = xine_xmalloc (8192);
+  tmpbuffer = calloc(1, 8192);
 
   _x_assert(tmpbuffer != NULL);
 
@@ -1437,13 +1437,10 @@ static void load_epg_data(dvb_input_plugin_t *this)
      already "found" in the stream. This information is used to initialize the 
      channel's EPG structs when the EPG information for the channel is seen in 
      the stream the first time. */
-  seen_channels = xine_xmalloc(this->num_channels*sizeof(char));
+  seen_channels = calloc(this->num_channels, sizeof(char));
   _x_assert(seen_channels != NULL);
-  for (i = 0; i < this->num_channels; i++) {
-      seen_channels[i] = 0;
-  }
 
-  foo = xine_xmalloc(8192);
+  foo = calloc(1, 8192);
   _x_assert(foo != NULL);
 
   fd.fd = this->tuner->fd_pidfilter[EITFILTER];
@@ -1493,19 +1490,19 @@ static void load_epg_data(dvb_input_plugin_t *this)
          Allocate space for the strings. */
       if (current_channel->epg[current_channel->epg_count] == NULL) {
 	  current_channel->epg[current_channel->epg_count] =
-	      xine_xmalloc(sizeof(epg_entry_t));
+	    calloc(1, sizeof(epg_entry_t));
 	  _x_assert(current_channel->epg[current_channel->epg_count] != NULL);
 
 	  current_channel->epg[current_channel->epg_count]->progname = 
-	      xine_xmalloc((MAX_EPG_PROGRAM_NAME_LENGTH + 1) * sizeof(char));
+	    malloc(MAX_EPG_PROGRAM_NAME_LENGTH + 1);
 	  _x_assert(current_channel->epg[current_channel->epg_count]->progname != NULL);
 
 	  current_channel->epg[current_channel->epg_count]->description =
-	      xine_xmalloc((MAX_EPG_PROGRAM_DESCRIPTION_LENGTH + 1) * sizeof(char));
+	    malloc(MAX_EPG_PROGRAM_DESCRIPTION_LENGTH + 1);
 	  _x_assert(current_channel->epg[current_channel->epg_count]->description != NULL);
 
 	  current_channel->epg[current_channel->epg_count]->content = 
-	      xine_xmalloc((MAX_EPG_CONTENT_TYPE_LENGTH + 1) * sizeof(char));
+	    malloc(MAX_EPG_CONTENT_TYPE_LENGTH + 1);
 	  _x_assert(current_channel->epg[current_channel->epg_count]->content != NULL);
 	  current_channel->epg[current_channel->epg_count]->running = 0;
 
@@ -1825,7 +1822,7 @@ static void show_program_info(int x, int y, int max_x, int max_y, int* last_y,
   if (epg_data == NULL || epg_data->progname == NULL)
     return;
 
-  buffer = xine_xmalloc(512);
+  buffer = calloc(1, 512);
 
   _x_assert(buffer != NULL);
 
@@ -2207,7 +2204,7 @@ static void do_record (dvb_input_plugin_t *this) {
     this->stream->osd_renderer->hide (this->paused_osd, 0);
     this->record_paused=0;
   } else {
-    t=xine_xmalloc(sizeof(time_t));
+   t=calloc(1, sizeof(time_t));
 
     _x_assert(t != NULL);
 
@@ -2876,7 +2873,7 @@ static int dvb_plugin_open(input_plugin_t * this_gen)
 	}
 	ptr = this->mrl;
 	ptr += 7;
-	channels = xine_xmalloc(sizeof(channel_t));
+	channels = calloc(1, sizeof(channel_t));
 	_x_assert(channels != NULL);
 	if (extract_channel_from_string(channels, ptr, tuner->feinfo.type) < 0) {
           free(channels);
@@ -2896,7 +2893,7 @@ static int dvb_plugin_open(input_plugin_t * this_gen)
          }
 	   ptr = this->mrl;
 	   ptr += 7;
-	   channels = xine_xmalloc(sizeof(channel_t));
+	   channels = calloc(1, sizeof(channel_t));
 	   _x_assert(channels != NULL);
 	   if (extract_channel_from_string(channels, ptr, tuner->feinfo.type) < 0) {
               free(channels);
@@ -2919,7 +2916,7 @@ static int dvb_plugin_open(input_plugin_t * this_gen)
       }
       ptr = this->mrl;
       ptr += 7;
-      channels = xine_xmalloc(sizeof(channel_t));
+      channels = calloc(1, sizeof(channel_t));
       _x_assert(channels != NULL);
       if (extract_channel_from_string(channels, ptr, tuner->feinfo.type) < 0)
       {
@@ -2945,7 +2942,7 @@ static int dvb_plugin_open(input_plugin_t * this_gen)
       }
       ptr = this->mrl;
       ptr += 7;
-      channels = xine_xmalloc(sizeof(channel_t));
+      channels = calloc(1, sizeof(channel_t));
       _x_assert(channels != NULL);
       if (extract_channel_from_string(channels, ptr, tuner->feinfo.type) < 0)
       {
@@ -3109,7 +3106,7 @@ static input_plugin_t *dvb_class_get_instance (input_class_t *class_gen,
 
   fprintf(stderr, "input_dvb: continuing in get_instance\n");
 
-  this = (dvb_input_plugin_t *) xine_xmalloc (sizeof(dvb_input_plugin_t));
+  this = calloc(1, sizeof(dvb_input_plugin_t));
 
   _x_assert(this != NULL);
 
@@ -3256,7 +3253,7 @@ static void *init_class (xine_t *xine, void *data) {
   dvb_input_class_t  *this;
   config_values_t *config = xine->config;
 
-  this = (dvb_input_class_t *) xine_xmalloc (sizeof (dvb_input_class_t));
+  this = calloc(1, sizeof (dvb_input_class_t));
   _x_assert(this != NULL);
 
   this->xine   = xine;
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index 620ce98c4..441a4544b 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -1625,7 +1625,7 @@ static input_plugin_t *dvd_class_get_instance (input_class_t *class_gen, xine_st
   if (strncasecmp (data, handled_mrl, strlen(handled_mrl) ) != 0)
     return NULL;
 
-  this = (dvd_input_plugin_t *) xine_xmalloc (sizeof (dvd_input_plugin_t));
+  this = calloc(1, sizeof (dvd_input_plugin_t));
   if (!this) {
     return NULL;
   }
@@ -1758,7 +1758,7 @@ static void *init_class (xine_t *xine, void *data) {
   printf("input_dvd.c: config = %p\n", config);
 #endif
 
-  this = (dvd_input_class_t *) xine_xmalloc (sizeof (dvd_input_class_t));
+  this = (dvd_input_class_t *) calloc(1, sizeof (dvd_input_class_t));
   if (!this)
     return NULL;
   
diff --git a/src/input/input_file.c b/src/input/input_file.c
index 62d0d73d5..3364ef46b 100644
--- a/src/input/input_file.c
+++ b/src/input/input_file.c
@@ -421,7 +421,7 @@ static input_plugin_t *file_class_get_instance (input_class_t *cls_gen, xine_str
     return NULL;
   }
 
-  this = (file_input_plugin_t *) xine_xmalloc (sizeof (file_input_plugin_t));
+  this = (file_input_plugin_t *) calloc(1, sizeof (file_input_plugin_t));
   this->stream = stream;
   this->mrl    = mrl;
   this->fh     = -1;
@@ -849,7 +849,7 @@ static xine_mrl_t **file_class_get_dir (input_class_t *this_gen,
       if(num_files >= this->mrls_allocated_entries) {
 	++this->mrls_allocated_entries;
 	this->mrls = realloc(this->mrls, (this->mrls_allocated_entries+1) * sizeof(xine_mrl_t*));
-	this->mrls[num_files] = (xine_mrl_t *) xine_xmalloc(sizeof(xine_mrl_t));
+	this->mrls[num_files] = calloc(1, sizeof(xine_mrl_t));
       }
       else
 	memset(this->mrls[num_files], 0, sizeof(xine_mrl_t));
@@ -867,7 +867,7 @@ static xine_mrl_t **file_class_get_dir (input_class_t *this_gen,
       if(num_files >= this->mrls_allocated_entries) {
 	++this->mrls_allocated_entries;
 	this->mrls = realloc(this->mrls, (this->mrls_allocated_entries+1) * sizeof(xine_mrl_t*));
-	this->mrls[num_files] = (xine_mrl_t *) xine_xmalloc(sizeof(xine_mrl_t));
+	this->mrls[num_files] = calloc(1, sizeof(xine_mrl_t));
       }
       else
 	memset(this->mrls[num_files], 0, sizeof(xine_mrl_t));
@@ -885,7 +885,7 @@ static xine_mrl_t **file_class_get_dir (input_class_t *this_gen,
       if(num_files >= this->mrls_allocated_entries) {
 	++this->mrls_allocated_entries;
 	this->mrls = realloc(this->mrls, (this->mrls_allocated_entries+1) * sizeof(xine_mrl_t*));
-	this->mrls[num_files] = (xine_mrl_t *) xine_xmalloc(sizeof(xine_mrl_t));
+	this->mrls[num_files] = calloc(1, sizeof(xine_mrl_t));
       }
       else
 	memset(this->mrls[num_files], 0, sizeof(xine_mrl_t));
@@ -965,7 +965,7 @@ static void *init_plugin (xine_t *xine, void *data) {
   file_input_class_t  *this;
   config_values_t     *config;
 
-  this = (file_input_class_t *) xine_xmalloc (sizeof (file_input_class_t));
+  this = (file_input_class_t *) calloc(1, sizeof (file_input_class_t));
 
   this->xine   = xine;
   this->config = xine->config;
@@ -979,7 +979,7 @@ static void *init_plugin (xine_t *xine, void *data) {
   this->input_class.dispose            = file_class_dispose;
   this->input_class.eject_media        = NULL;
 
-  this->mrls = (xine_mrl_t **) xine_xmalloc(sizeof(xine_mrl_t*));
+  this->mrls = (xine_mrl_t **) calloc(1, sizeof(xine_mrl_t*));
   this->mrls_allocated_entries = 0;
 
   {
diff --git a/src/input/input_http.c b/src/input/input_http.c
index af696ca14..93198a06e 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -1022,7 +1022,7 @@ static input_plugin_t *http_class_get_instance (input_class_t *cls_gen, xine_str
       strncasecmp (mrl, "peercast://pls/", 15)) {
     return NULL;
   }
-  this = (http_input_plugin_t *) xine_xmalloc(sizeof(http_input_plugin_t));
+  this = calloc(1, sizeof(http_input_plugin_t));
 
   if (!strncasecmp (mrl, "peercast://pls/", 15)) {
     this->mrl = xine_xmalloc (30 + strlen(mrl) - 15);
@@ -1073,7 +1073,7 @@ static void *init_class (xine_t *xine, void *data) {
   config_values_t     *config;
   char                *proxy_env;
 
-  this = (http_input_class_t *) xine_xmalloc (sizeof (http_input_class_t));
+  this = calloc(1, sizeof (http_input_class_t));
 
   this->xine   = xine;
   this->config = xine->config;
diff --git a/src/input/input_mms.c b/src/input/input_mms.c
index 6a1e729e6..158b40448 100644
--- a/src/input/input_mms.c
+++ b/src/input/input_mms.c
@@ -401,7 +401,7 @@ static input_plugin_t *mms_class_get_instance (input_class_t *cls_gen, xine_stre
     return NULL;
   }
 
-  this = (mms_input_plugin_t *) xine_xmalloc (sizeof (mms_input_plugin_t));
+  this = calloc(1, sizeof (mms_input_plugin_t));
   cls->ip = this;
   this->stream   = stream;
   this->mms      = NULL;
@@ -459,7 +459,7 @@ static void *init_class (xine_t *xine, void *data) {
 
   mms_input_class_t  *this;
 
-  this = (mms_input_class_t *) xine_xmalloc (sizeof (mms_input_class_t));
+  this = calloc(1, sizeof (mms_input_class_t));
 
   this->xine   = xine;
   this->ip                             = NULL;
diff --git a/src/input/input_net.c b/src/input/input_net.c
index fe78c93f4..391f33a60 100644
--- a/src/input/input_net.c
+++ b/src/input/input_net.c
@@ -480,7 +480,7 @@ static input_plugin_t *net_class_get_instance (input_class_t *cls_gen, xine_stre
     return NULL;
   }
 
-  this = xine_xmalloc(sizeof(net_input_plugin_t));
+  this = calloc(1, sizeof(net_input_plugin_t));
   this->mrl           = strdup(mrl);
   this->host_port     = strdup(filename);
   this->stream        = stream;
@@ -528,7 +528,7 @@ static void *init_class (xine_t *xine, void *data) {
 
   net_input_class_t  *this;
 
-  this         = (net_input_class_t *) xine_xmalloc(sizeof(net_input_class_t));
+  this         = calloc(1, sizeof(net_input_class_t));
   this->config = xine->config;
   this->xine   = xine;
 
diff --git a/src/input/input_pnm.c b/src/input/input_pnm.c
index 680c5b1e8..937b7c89b 100644
--- a/src/input/input_pnm.c
+++ b/src/input/input_pnm.c
@@ -231,7 +231,7 @@ static input_plugin_t *pnm_class_get_instance (input_class_t *cls_gen, xine_stre
     return NULL;
   }
 
-  this = (pnm_input_plugin_t *) xine_xmalloc (sizeof (pnm_input_plugin_t));
+  this = calloc(1, sizeof (pnm_input_plugin_t));
 
   this->stream = stream;
   this->pnm    = NULL;
@@ -276,7 +276,7 @@ static void *init_class (xine_t *xine, void *data) {
 
   pnm_input_class_t  *this;
 
-  this = (pnm_input_class_t *) xine_xmalloc (sizeof (pnm_input_class_t));
+  this = calloc(1, sizeof (pnm_input_class_t));
 
   this->xine   = xine;
 
diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c
index 1b8000072..e5c70c64d 100644
--- a/src/input/input_pvr.c
+++ b/src/input/input_pvr.c
@@ -379,7 +379,7 @@ static void pvrscr_exit (scr_plugin_t *scr) {
 static pvrscr_t* pvrscr_init (void) {
   pvrscr_t *this;
 
-  this = (pvrscr_t *) xine_xmalloc(sizeof(pvrscr_t));
+  this = calloc(1, sizeof(pvrscr_t));
 
   this->scr.interface_version = 3;
   this->scr.get_priority      = pvrscr_get_priority;
@@ -1480,7 +1480,7 @@ static input_plugin_t *pvr_class_get_instance (input_class_t *cls_gen, xine_stre
   mrl = strdup(data);
   aux = &mrl[5];
 
-  this = (pvr_input_plugin_t *) xine_xmalloc (sizeof (pvr_input_plugin_t));
+  this = calloc(1, sizeof (pvr_input_plugin_t));
   this->class        = cls;
   this->stream       = stream;
   this->dev_fd       = -1;
@@ -1564,7 +1564,7 @@ static void *init_plugin (xine_t *xine, void *data) {
 
   pvr_input_class_t  *this;
 
-  this = (pvr_input_class_t *) xine_xmalloc (sizeof (pvr_input_class_t));
+  this = calloc(1, sizeof (pvr_input_class_t));
 
   this->xine   = xine;
   this->config = xine->config;
diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c
index 25498f289..66fcba87e 100644
--- a/src/input/input_rtp.c
+++ b/src/input/input_rtp.c
@@ -717,7 +717,7 @@ static input_plugin_t *rtp_class_get_instance (input_class_t *cls_gen,
     }
   }
   
-  this = (rtp_input_plugin_t *) xine_xmalloc(sizeof(rtp_input_plugin_t));
+  this = calloc(1, sizeof(rtp_input_plugin_t));
   this->stream       = stream;
   this->mrl          = mrl;
   this->filename     = filename;
@@ -784,7 +784,7 @@ static void *init_class (xine_t *xine, void *data) {
   rtp_input_class_t  *this;
 
   
-  this         = (rtp_input_class_t *) xine_xmalloc(sizeof(rtp_input_class_t));
+  this         = calloc(1, sizeof(rtp_input_class_t));
   this->config = xine->config;
   this->xine   = xine;
 
diff --git a/src/input/input_rtsp.c b/src/input/input_rtsp.c
index 2895edf5d..8491d0a5d 100644
--- a/src/input/input_rtsp.c
+++ b/src/input/input_rtsp.c
@@ -246,7 +246,7 @@ static input_plugin_t *rtsp_class_get_instance (input_class_t *cls_gen, xine_str
   if (strncasecmp (mrl, "rtsp://", 6))
     return NULL;
 
-  this = (rtsp_input_plugin_t *) xine_xmalloc (sizeof (rtsp_input_plugin_t));
+  this = calloc(1, sizeof (rtsp_input_plugin_t));
 
   this->stream  = stream;
   this->rtsp    = NULL;
@@ -254,7 +254,7 @@ static input_plugin_t *rtsp_class_get_instance (input_class_t *cls_gen, xine_str
   /* since we handle only real streams yet, we can savely add
    * an .rm extention to force handling by demux_real.
    */
-  this->public_mrl = xine_xmalloc (sizeof (char)*(strlen(this->mrl)+10));
+  this->public_mrl = calloc(strlen(this->mrl)+10, sizeof (char));
   sprintf(this->public_mrl, "%s.rm", this->mrl);
   
   this->nbc     = nbc_init (stream);
@@ -298,7 +298,7 @@ static void *init_class (xine_t *xine, void *data) {
 
   rtsp_input_class_t  *this;
 
-  this = (rtsp_input_class_t *) xine_xmalloc (sizeof (rtsp_input_class_t));
+  this = calloc(1, sizeof (rtsp_input_class_t));
 
   this->xine   = xine;
 
diff --git a/src/input/input_smb.c b/src/input/input_smb.c
index 777b80b46..c4706d9f3 100644
--- a/src/input/input_smb.c
+++ b/src/input/input_smb.c
@@ -359,7 +359,7 @@ static xine_mrl_t **smb_class_get_dir (input_class_t *this_gen,
 				++this->mrls_allocated_entries;
 				this->mrls = realloc(this->mrls, 
 					(this->mrls_allocated_entries+1) * sizeof(xine_mrl_t*));
-				this->mrls[num_files] = (xine_mrl_t *) xine_xmalloc(sizeof(xine_mrl_t));
+				this->mrls[num_files] = calloc(1, sizeof(xine_mrl_t));
 			}else
 				memset(this->mrls[num_files], 0, sizeof(xine_mrl_t));
       
@@ -376,7 +376,7 @@ static xine_mrl_t **smb_class_get_dir (input_class_t *this_gen,
 				++this->mrls_allocated_entries;
 				this->mrls = realloc(this->mrls, 
 					(this->mrls_allocated_entries+1) * sizeof(xine_mrl_t*));
-				this->mrls[num_files] = (xine_mrl_t *) xine_xmalloc(sizeof(xine_mrl_t));
+				this->mrls[num_files] = calloc(1, sizeof(xine_mrl_t));
 			}else
 				memset(this->mrls[num_files], 0, sizeof(xine_mrl_t));
 
@@ -475,7 +475,7 @@ smb_class_get_instance (input_class_t *class_gen, xine_stream_t *stream,
 	if (strncmp (mrl, "smb://",6))
 		return NULL;
 
-	this = (smb_input_t *)xine_xmalloc(sizeof(smb_input_t));
+	this = calloc(1, sizeof(smb_input_t));
 	this->stream = stream;
 	this->mrl = strdup (mrl);
 	this->fd = -1;
@@ -514,7 +514,7 @@ static void
 	if (smbc_init(smb_auth,(xine->verbosity >= XINE_VERBOSITY_DEBUG)))
 	  goto _exit_error;
 	
-	this = (smb_input_class_t *) xine_xmalloc(sizeof(smb_input_class_t));
+	this = calloc(1, sizeof(smb_input_class_t));
 	this->xine = xine;
 
 	this->input_class.get_instance       = smb_class_get_instance;
diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c
index 465e9c00b..0ae841b4b 100644
--- a/src/input/input_stdin_fifo.c
+++ b/src/input/input_stdin_fifo.c
@@ -311,7 +311,7 @@ static input_plugin_t *stdin_class_get_instance (input_class_t *class_gen,
    * => create plugin instance
    */
 
-  this       = (stdin_input_plugin_t *) xine_xmalloc(sizeof(stdin_input_plugin_t));
+  this       = calloc(1, sizeof(stdin_input_plugin_t));
 
   this->stream = stream;
   this->curpos = 0;
@@ -362,7 +362,7 @@ static void *init_class (xine_t *xine, void *data) {
 
   stdin_input_class_t  *this;
 
-  this = (stdin_input_class_t *) xine_xmalloc (sizeof (stdin_input_class_t));
+  this = calloc(1, sizeof (stdin_input_class_t));
 
   this->xine   = xine;
 
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index d0558b492..7bb5322b5 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -349,7 +349,7 @@ static pvrscr_t* pvrscr_init (void)
 {
    pvrscr_t *this;
    
-   this = (pvrscr_t *) xine_xmalloc(sizeof(pvrscr_t));
+   this = calloc(1, sizeof(pvrscr_t));
    
    this->scr.interface_version = 3;
    this->scr.get_priority      = pvrscr_get_priority;
@@ -719,13 +719,13 @@ static void allocate_audio_frames(v4l_input_plugin_t *this)
     buf_element_t *frame;
     
     /* Audio frame */
-    frame = xine_xmalloc(sizeof(buf_element_t));
+    frame = calloc(1, sizeof(buf_element_t));
     
     frame->content         = xine_xmalloc(this->periodsize);
     frame->type	           = BUF_AUDIO_LPCM_LE;
     frame->source          = this;
     frame->free_buffer     = store_aud_frame;
-    frame->extra_info      = xine_xmalloc(sizeof(extra_info_t));
+    frame->extra_info      = calloc(1, sizeof(extra_info_t));
     
     store_aud_frame(frame);
   }
@@ -957,13 +957,13 @@ static int open_video_capture_device(v4l_input_plugin_t *this)
   for (i = 0; i < NUM_FRAMES; i++) {
     buf_element_t *frame;
       
-    frame = xine_xmalloc (sizeof (buf_element_t));
+    frame = calloc(1, sizeof (buf_element_t));
     
     frame->content         = xine_xmalloc (this->frame_size);
     frame->type            = this->frame_format;
     frame->source          = this;
     frame->free_buffer     = store_vid_frame;
-    frame->extra_info      = xine_xmalloc(sizeof(extra_info_t));
+    frame->extra_info      = calloc(1, sizeof(extra_info_t));
     
     store_vid_frame(frame);
   }
@@ -1715,7 +1715,7 @@ static input_plugin_t *v4l_class_get_instance (input_class_t *cls_gen,
     return NULL;
   }
   
-  this = (v4l_input_plugin_t *) xine_xmalloc (sizeof (v4l_input_plugin_t));
+  this = calloc(1, sizeof (v4l_input_plugin_t));
     
   extract_mrl(this, mrl);
   
@@ -1900,7 +1900,7 @@ static void *init_video_class (xine_t *xine, void *data)
   v4l_input_class_t  *this;
   config_values_t    *config = xine->config;
   
-  this = (v4l_input_class_t *) xine_xmalloc (sizeof (v4l_input_class_t));
+  this = calloc(1, sizeof (v4l_input_class_t));
   
   this->xine                           = xine;
   
@@ -1934,7 +1934,7 @@ static void *init_radio_class (xine_t *xine, void *data)
   v4l_input_class_t  *this;
   config_values_t    *config = xine->config;
   
-  this = (v4l_input_class_t *) xine_xmalloc (sizeof (v4l_input_class_t));
+  this = calloc(1, sizeof (v4l_input_class_t));
   
   this->xine                           = xine;
   
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index 007fa5946..02c2e83ab 100644
--- a/src/input/input_vcd.c
+++ b/src/input/input_vcd.c
@@ -889,7 +889,7 @@ static input_plugin_t *vcd_class_get_instance (input_class_t *cls_gen, xine_stre
     return 0;
   }
     
-  this = (vcd_input_plugin_t *) xine_xmalloc(sizeof(vcd_input_plugin_t));
+  this = calloc(1, sizeof(vcd_input_plugin_t));
 
   this->stream = stream;
   this->mrl    = mrl;
@@ -991,7 +991,7 @@ static xine_mrl_t **vcd_class_get_dir (input_class_t *this_gen, const char *file
       ++this->mrls_allocated_entries;
       /* note: 1 extra pointer for terminating NULL */
       this->mrls = realloc(this->mrls, (this->mrls_allocated_entries+1) * sizeof(xine_mrl_t*));
-      this->mrls[(i-1)] = (xine_mrl_t *) xine_xmalloc(sizeof(xine_mrl_t));
+      this->mrls[(i-1)] = calloc(1, sizeof(xine_mrl_t));
     }
     else {
       memset(this->mrls[(i-1)], 0, sizeof(xine_mrl_t));
@@ -1079,7 +1079,7 @@ static void *init_class (xine_t *xine, void *data) {
   config_values_t    *config = xine->config;
   int                 i;
 
-  this = (vcd_input_class_t *) xine_xmalloc (sizeof (vcd_input_class_t));
+  this = calloc(1, sizeof (vcd_input_class_t));
 
   this->xine   = xine;
 
@@ -1097,11 +1097,11 @@ static void *init_class (xine_t *xine, void *data) {
 					    "you intend to play your VideoCDs with."),
 					  10, device_change_cb, (void *)this);
 
-  this->mrls = (xine_mrl_t **) xine_xmalloc(sizeof(xine_mrl_t*));
+  this->mrls = calloc(1, sizeof(xine_mrl_t*));
   this->mrls_allocated_entries = 0;
 
   for (i = 0; i < 100; i++) {
-    this->filelist[i]       = (char *) xine_xmalloc(sizeof(char *) * 256);
+    this->filelist[i]       = calloc(256, sizeof(char));
   }
   
   return this;
diff --git a/src/input/libreal/real.c b/src/input/libreal/real.c
index fecf9a794..dc3f00105 100644
--- a/src/input/libreal/real.c
+++ b/src/input/libreal/real.c
@@ -449,7 +449,7 @@ rmff_header_t *real_parse_sdp(char *data, char **stream_rules, uint32_t bandwidt
   if (!desc) return NULL;
  
   buf=xine_buffer_init(2048);
-  header = xine_xmalloc(sizeof(rmff_header_t));
+  header = calloc(1, sizeof(rmff_header_t));
 
   header->fileheader=rmff_new_fileheader(4+desc->stream_count);
   header->cont=rmff_new_cont(
diff --git a/src/input/libreal/sdpplin.c b/src/input/libreal/sdpplin.c
index 9117d15a5..2596391f9 100644
--- a/src/input/libreal/sdpplin.c
+++ b/src/input/libreal/sdpplin.c
@@ -122,7 +122,7 @@ static int filter(const char *in, const char *filter, char **out) {
 }
 static sdpplin_stream_t *sdpplin_parse_stream(char **data) {
 
-  sdpplin_stream_t *desc = xine_xmalloc(sizeof(sdpplin_stream_t));
+  sdpplin_stream_t *desc = calloc(1, sizeof(sdpplin_stream_t));
   char      *buf=xine_buffer_init(32);
   char      *decoded=xine_buffer_init(32);
   int       handled;
@@ -239,7 +239,7 @@ static sdpplin_stream_t *sdpplin_parse_stream(char **data) {
 
 sdpplin_t *sdpplin_parse(char *data) {
 
-  sdpplin_t        *desc = xine_xmalloc(sizeof(sdpplin_t));
+  sdpplin_t        *desc = calloc(1, sizeof(sdpplin_t));
   sdpplin_stream_t *stream;
   char             *buf=xine_buffer_init(32);
   char             *decoded=xine_buffer_init(32);
diff --git a/src/input/librtsp/rtsp_session.c b/src/input/librtsp/rtsp_session.c
index 5b02282e9..4e636410d 100644
--- a/src/input/librtsp/rtsp_session.c
+++ b/src/input/librtsp/rtsp_session.c
@@ -78,7 +78,7 @@ const char *rtsp_bandwidth_strs[]={"14.4 Kbps (Modem)", "19.2 Kbps (Modem)",
 
 rtsp_session_t *rtsp_session_start(xine_stream_t *stream, char *mrl) {
 
-  rtsp_session_t *rtsp_session = xine_xmalloc(sizeof(rtsp_session_t));
+  rtsp_session_t *rtsp_session = calloc(1, sizeof(rtsp_session_t));
   xine_t *xine = stream->xine;
   char *server;
   char *mrl_line=strdup(mrl);
diff --git a/src/input/mms.c b/src/input/mms.c
index 4a073f0ae..97a05dd89 100644
--- a/src/input/mms.c
+++ b/src/input/mms.c
@@ -680,7 +680,7 @@ mms_t *mms_connect (xine_stream_t *stream, const char *url, int bandwidth) {
   if (!url)
     return NULL;
 
-  this = (mms_t*) xine_xmalloc (sizeof (mms_t));
+  this = calloc(1, sizeof (mms_t));
 
   this->stream          = stream;
   this->url             = strdup (url);
diff --git a/src/input/mmsh.c b/src/input/mmsh.c
index ae1c62bc1..2feb7c37b 100644
--- a/src/input/mmsh.c
+++ b/src/input/mmsh.c
@@ -636,7 +636,7 @@ mmsh_t *mmsh_connect (xine_stream_t *stream, const char *url, int bandwidth) {
 
   report_progress (stream, 0);
 
-  this = (mmsh_t*) xine_xmalloc (sizeof (mmsh_t));
+  this = calloc(1, sizeof (mmsh_t));
 
   this->stream          = stream;
   this->url             = strdup(url);
diff --git a/src/input/net_buf_ctrl.c b/src/input/net_buf_ctrl.c
index 1a8ae388e..4a39aadfb 100644
--- a/src/input/net_buf_ctrl.c
+++ b/src/input/net_buf_ctrl.c
@@ -492,7 +492,7 @@ static void nbc_get_cb (fifo_buffer_t *fifo,
 
 nbc_t *nbc_init (xine_stream_t *stream) {
   
-  nbc_t *this = (nbc_t *) xine_xmalloc (sizeof (nbc_t));
+  nbc_t *this = calloc(1, sizeof (nbc_t));
   fifo_buffer_t *video_fifo = stream->video_fifo;
   fifo_buffer_t *audio_fifo = stream->audio_fifo;
   double video_fifo_factor, audio_fifo_factor;
diff --git a/src/input/pnm.c b/src/input/pnm.c
index 38d65b850..fca2050d3 100644
--- a/src/input/pnm.c
+++ b/src/input/pnm.c
@@ -716,7 +716,7 @@ pnm_t *pnm_connect(xine_stream_t *stream, const char *mrl) {
   
   mrl_ptr+=6;
 
-  p = xine_xmalloc(sizeof(pnm_t));
+  p = calloc(1, sizeof(pnm_t));
   p->stream = stream;
   p->port=7070;
   p->url=strdup(mrl);
diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c
index 2e52ccc0f..d024c5bff 100644
--- a/src/input/vcd/xineplug_inp_vcd.c
+++ b/src/input/vcd/xineplug_inp_vcd.c
@@ -1767,7 +1767,7 @@ vcd_init (xine_t *xine, void *data)
 
   dbg_print(INPUT_DBG_CALL, "Called\n");
 
-  class = (vcd_input_class_t *) xine_xmalloc (sizeof (vcd_input_class_t));
+  class = calloc(1, sizeof (vcd_input_class_t));
 
   class->xine   = xine;
   class->config = config = xine->config;