Merge from 1.1

3 files changed, 8 insertions, 8 deletions

diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c
index b82db8b77..0eada28b4 100644
--- a/src/xine-engine/configfile.c
+++ b/src/xine-engine/configfile.c
@@ -375,7 +375,7 @@ static const char *config_translate_key (const char *key, char **tmp) {
   *tmp = NULL;
   if (!strncmp (key, "decoder.", 8) &&
       !strcmp (key + (trans = strlen (key)) - 9, "_priority")) {
-    asprintf (tmp, "engine.decoder_priorities.%.*s", trans - 17, key + 8);
+    *tmp = _x_asprintf ("engine.decoder_priorities.%.*s", trans - 17, key + 8);
     return *tmp;
   }
 
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index f5db64bc0..3063ba4df 100644
--- a/src/xine-engine/load_plugins.c
+++ b/src/xine-engine/load_plugins.c
@@ -388,7 +388,7 @@ static void _insert_node (xine_t *this,
 
     snprintf(key, sizeof(key), "engine.decoder_priorities.%s", info->id);
     for (i = 0; catalog->prio_desc[i]; i++);
-    asprintf(&catalog->prio_desc[i], _("priority for %s decoder"), info->id);
+    catalog->prio_desc[i] = _x_asprintf(_("priority for %s decoder"), info->id);
     this->config->register_num (this->config,
 				key,
 				0,
@@ -1199,7 +1199,7 @@ static void save_catalog (xine_t *this) {
 
   if ( ! cachefile ) return;
 
-  asprintf(&cachefile_new, "%s.new", cachefile);
+  cachefile_new = _x_asprintf("%s.new", cachefile);
 
   if( (fp = fopen(cachefile_new,"w")) != NULL ) {
     int i;
@@ -1298,7 +1298,7 @@ void _x_scan_plugins (xine_t *this) {
       } else
         len = strlen(q);
       if (q[0] == '~' && q[1] == '/')
-	asprintf (&dir, "%s%.*s", homedir, (int)(len - 1), q + 1);
+	dir = _x_asprintf ("%s%.*s", homedir, (int)(len - 1), q + 1);
       else
 	dir = strndup (q, len);
       push_if_dir (plugindirs, dir); /* store or free it */
@@ -1306,11 +1306,11 @@ void _x_scan_plugins (xine_t *this) {
   } else {
     char *dir;
     int i;
-    asprintf (&dir, "%s/.xine/plugins", homedir);
+    dir = _x_asprintf ("%s/.xine/plugins", homedir);
     push_if_dir (plugindirs, dir);
     for (i = 0; i <= XINE_LT_AGE; ++i)
     {
-      asprintf (&dir, "%s.%d", XINE_PLUGINROOT, XINE_LT_AGE - i);
+      dir = _x_asprintf ("%s.%d", XINE_PLUGINROOT, XINE_LT_AGE - i);
       push_if_dir (plugindirs, dir);
     }
   }
diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c
index 8e48da99d..c827607b1 100644
--- a/src/xine-engine/osd.c
+++ b/src/xine-engine/osd.c
@@ -1085,7 +1085,7 @@ static int osd_lookup_xdg( osd_object_t *osd, const char *const fontname ) {
     while( (*data_dirs) && *(*data_dirs) ) {
       FT_Error fte = FT_Err_Ok;
       char *fontpath = NULL;
-      asprintf(&fontpath, "%s/"PACKAGE"/fonts/%s", *data_dirs, fontname);
+      fontpath = _x_asprintf("%s/"PACKAGE"/fonts/%s", *data_dirs, fontname);
 
       fte = FT_New_Face(osd->ft2->library, fontpath, 0, &osd->ft2->face);
 
@@ -1661,7 +1661,7 @@ static void osd_preload_fonts (osd_renderer_t *this, char *path) {
           lprintf("font '%s' size %d is preloaded\n",
                   font->name, font->size);
 
-          asprintf (&font->filename, "%s/%s", path, entry->d_name);
+          font->filename = _x_asprintf ("%s/%s", path, entry->d_name);
 
           font->next = this->fonts;
           this->fonts = font;