diff options
| author | Petri Hintukainen <phintuka@users.sourceforge.net> | 2011-10-17 14:44:39 +0300 |
|---|---|---|
| committer | Petri Hintukainen <phintuka@users.sourceforge.net> | 2011-10-17 14:44:39 +0300 |
| commit | 4467de60c581f2a5f7ae737c30ab63be0e3f6e25 (patch) | |
| tree | 37d2893e34f613a65383f9288d0af3b985fcd85f /src/input/input_file.c | |
| parent | 81c84b6bf06482c5988fd16f68050177c1afc358 (diff) | |
| parent | 9f105cfe9059df4a9a1f5278679151a5d9c387f6 (diff) | |
| download | xine-lib-4467de60c581f2a5f7ae737c30ab63be0e3f6e25.tar.gz xine-lib-4467de60c581f2a5f7ae737c30ab63be0e3f6e25.tar.bz2 | |
Merge from 1.1
Diffstat (limited to 'src/input/input_file.c')
| -rw-r--r-- | src/input/input_file.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/input/input_file.c b/src/input/input_file.c index 4c5e3e563..c2ecd3c0b 100644 --- a/src/input/input_file.c +++ b/src/input/input_file.c @@ -711,8 +711,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); @@ -747,8 +746,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); @@ -779,8 +777,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); |