Merge file removal.

1 files changed, 19 insertions, 22 deletions

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;