[vlc-commits] file-access (+vdr, mtp): give error message also in Fatal dialog

[Ilkka Ollakka]

vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Mon Aug 29 16:36:39 2011 +0300| [664218734b98035c75e56f749f622f19f3a8ed74] | committer: Ilkka Ollakka

file-access (+vdr,mtp): give error message also in Fatal dialog

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=664218734b98035c75e56f749f622f19f3a8ed74
---

 modules/access/file.c |    4 ++--
 modules/access/mtp.c  |    4 ++--
 modules/access/vdr.c  |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/access/file.c b/modules/access/file.c
index 5114f38..c89a6ae 100644
--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -172,7 +172,7 @@ int Open( vlc_object_t *p_this )
         {
             msg_Err (p_access, "cannot open file %s (%m)", path);
             dialog_Fatal (p_access, _("File reading failed"),
-                          _("VLC could not open the file \"%s\"."), path);
+                          _("VLC could not open the file \"%s\". (%m)"), path);
         }
 
 #ifdef WIN32
@@ -303,7 +303,7 @@ ssize_t FileRead( access_t *p_access, uint8_t *p_buffer, size_t i_len )
 
             default:
                 msg_Err (p_access, "failed to read (%m)");
-                dialog_Fatal (p_access, _("File reading failed"), "%s",
+                dialog_Fatal (p_access, _("File reading failed"), "%s (%m)",
                               _("VLC could not read the file."));
                 p_access->info.b_eof = true;
                 return 0;
diff --git a/modules/access/mtp.c b/modules/access/mtp.c
index 1f0e4c5..16a17df 100644
--- a/modules/access/mtp.c
+++ b/modules/access/mtp.c
@@ -218,7 +218,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
 
             default:
                 msg_Err( p_access, "read failed (%m)" );
-                dialog_Fatal( p_access, _( "File reading failed" ), "%s",
+                dialog_Fatal( p_access, _( "File reading failed" ), "%s (%m)",
                                 _( "VLC could not read the file." ) );
                 p_access->info.b_eof = true;
                 return 0;
@@ -307,7 +307,7 @@ static int open_file( access_t *p_access, const char *path )
     {
         msg_Err( p_access, "cannot open file %s (%m)", path );
         dialog_Fatal( p_access, _( "File reading failed" ),
-                        _( "VLC could not open the file \"%s\"." ), path );
+                        _( "VLC could not open the file \"%s\". (%m)" ), path );
         return -1;
     }
 
diff --git a/modules/access/vdr.c b/modules/access/vdr.c
index 7d578b3..8cb43ea 100644
--- a/modules/access/vdr.c
+++ b/modules/access/vdr.c
@@ -387,7 +387,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
     {
         /* abort on read error */
         msg_Err( p_access, "failed to read (%m)" );
-        dialog_Fatal( p_access, _("File reading failed"), "%s",
+        dialog_Fatal( p_access, _("File reading failed"), "%s (%m)",
                       _("VLC could not read the file.") );
         SwitchFile( p_access, -1 );
         return 0;
@@ -558,7 +558,7 @@ static bool SwitchFile( access_t *p_access, unsigned i_file )
 
 error:
     dialog_Fatal (p_access, _("File reading failed"), _("VLC could not"
-        " open the file \"%s\"."), psz_path);
+        " open the file \"%s\". (%m)"), psz_path);
     if( p_sys->fd != -1 )
     {
         close( p_sys->fd );