From 9f105cfe9059df4a9a1f5278679151a5d9c387f6 Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Mon, 10 Oct 2011 12:41:10 +0300 Subject: Fixed asprintf usage --- src/input/input_file.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/input/input_file.c') diff --git a/src/input/input_file.c b/src/input/input_file.c index d5313d4dc..bb8afef92 100644 --- a/src/input/input_file.c +++ b/src/input/input_file.c @@ -720,8 +720,7 @@ static xine_mrl_t **file_class_get_dir (input_class_t *this_gen, else { dir_files[num_dir_files].origin = strdup(current_dir); - asprintf(&(dir_files[num_dir_files].mrl), "%s%s", - current_dir_slashed, pdirent->d_name); + dir_files[num_dir_files].mrl = _x_asprintf("%s%s", current_dir_slashed, pdirent->d_name); dir_files[num_dir_files].link = NULL; dir_files[num_dir_files].type = get_file_type(fullfilename, current_dir, this->xine); dir_files[num_dir_files].size = get_file_size(fullfilename, current_dir); @@ -756,8 +755,7 @@ static xine_mrl_t **file_class_get_dir (input_class_t *this_gen, if(this->show_hidden_files) { hide_files[num_hide_files].origin = strdup(current_dir); - asprintf(&(hide_files[num_hide_files].mrl), "%s%s", - current_dir_slashed, pdirent->d_name); + hide_files[num_hide_files].mrl = _x_asprintf("%s%s", current_dir_slashed, pdirent->d_name); hide_files[num_hide_files].link = NULL; hide_files[num_hide_files].type = get_file_type(fullfilename, current_dir, this->xine); hide_files[num_hide_files].size = get_file_size(fullfilename, current_dir); @@ -788,8 +786,7 @@ static xine_mrl_t **file_class_get_dir (input_class_t *this_gen, else { norm_files[num_norm_files].origin = strdup(current_dir); - asprintf(&(norm_files[num_norm_files].mrl), "%s%s", - current_dir_slashed, pdirent->d_name); + norm_files[num_norm_files].mrl = _x_asprintf("%s%s", current_dir_slashed, pdirent->d_name); norm_files[num_norm_files].link = NULL; norm_files[num_norm_files].type = get_file_type(fullfilename, current_dir, this->xine); norm_files[num_norm_files].size = get_file_size(fullfilename, current_dir); -- cgit v1.2.3