Merge from 1.1

1 files changed, 3 insertions, 11 deletions

diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c
index 53c104299..5e66bee82 100644
--- a/src/input/input_pvr.c
+++ b/src/input/input_pvr.c
@@ -510,36 +510,28 @@ static void pvr_adjust_realtime_speed(pvr_input_plugin_t *this, fifo_buffer_t *f
 #define PVR_FILENAME      "%s%08d_%08d.vob"
 
 static char *make_temp_name(pvr_input_plugin_t *this, int page) {
-  char *filename;
-
-  asprintf(&filename, PVR_FILENAME, this->tmp_prefix, this->session, page);
 
-  return filename;
+  return _x_asprintf(PVR_FILENAME, this->tmp_prefix, this->session, page);
 }
 
 #define SAVE_BASE_FILENAME     "ch%03d %02d-%02d-%04d %02d:%02d:%02d"
 
 static char *make_base_save_name(int channel, time_t tm) {
   struct tm rec_time;
-  char *filename;
 
   localtime_r(&tm, &rec_time);
 
-  asprintf(&filename, SAVE_BASE_FILENAME,
+  return _x_asprintf(SAVE_BASE_FILENAME,
            channel, rec_time.tm_mon+1, rec_time.tm_mday,
            rec_time.tm_year+1900, rec_time.tm_hour, rec_time.tm_min,
            rec_time.tm_sec);
-  return filename;
 }
 
 #define SAVE_FILENAME      "%s%s_%04d.vob"
 
 static char *make_save_name(pvr_input_plugin_t *this, char *base, int page) {
-  char *filename;
-
-  asprintf(&filename, SAVE_FILENAME, this->save_prefix, base, page);
 
-  return filename;
+  return _x_asprintf(SAVE_FILENAME, this->save_prefix, base, page);
 }
 
 /*