Merge file removal.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c
index 2dc89f0af..ed3d2fcfb 100644
--- a/src/xine-engine/configfile.c
+++ b/src/xine-engine/configfile.c
@@ -323,7 +323,7 @@ static cfg_entry_t *config_add (config_values_t *this, const char *key, int exp_
 
   cfg_entry_t *entry;
 
-  entry = (cfg_entry_t *) xine_xmalloc (sizeof (cfg_entry_t));
+  entry = calloc (1, sizeof (cfg_entry_t));
   entry->config        = this;
   entry->key           = strdup(key);
   entry->type          = XINE_CONFIG_TYPE_UNKNOWN;
@@ -1005,7 +1005,7 @@ void xine_config_save (xine_t *xine, const char *filename) {
       char    *buf = NULL;
       size_t   rlen;
       
-      buf = (char *) xine_xmalloc(config_stat.st_size + 1);
+      buf = (char *) malloc(config_stat.st_size + 1);
       if((rlen = fread(buf, 1, config_stat.st_size, f_config)) && ((off_t)rlen == config_stat.st_size)) {
 	(void) fwrite(buf, 1, rlen, f_backup);
       }
@@ -1204,7 +1204,7 @@ config_values_t *_x_config_init (void) {
   config_values_t *this;
   pthread_mutexattr_t attr;
 
-  if (!(this = xine_xmalloc(sizeof(config_values_t)))) {
+  if (!(this = calloc(1, sizeof(config_values_t)))) {
 
     printf ("configfile: could not allocate config object\n");
     _x_abort();