summaryrefslogtreecommitdiff
path: root/src/input/input_file.c
diff options
context:
space:
mode:
authorPetri Hintukainen <phintuka@users.sourceforge.net>2011-10-10 12:41:10 +0300
committerPetri Hintukainen <phintuka@users.sourceforge.net>2011-10-10 12:41:10 +0300
commit9f105cfe9059df4a9a1f5278679151a5d9c387f6 (patch)
tree8cb7a3700bd94fbb54e51d32dc353355f3f27b09 /src/input/input_file.c
parent83049ca9ad0d39a5795b586b76f954748a3de316 (diff)
downloadxine-lib-9f105cfe9059df4a9a1f5278679151a5d9c387f6.tar.gz
xine-lib-9f105cfe9059df4a9a1f5278679151a5d9c387f6.tar.bz2
Fixed asprintf usage
Diffstat (limited to 'src/input/input_file.c')
-rw-r--r--src/input/input_file.c9
1 files changed, 3 insertions, 6 deletions
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);