Sout - cleanup. and mark the TODO for the icecast MRL generation...

[vlc] / modules / access / file.c

diff --git a/modules/access/file.c b/modules/access/file.c
index 01aa0e28a177ff2b2123070c07c1a0b3842d252b..52456915fd16bd37a66131a5bfd9ea5288557859 100644 (file)
--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -168,7 +168,7 @@ static int Open( vlc_object_t *p_this )
     while (fd != -1)
     {
         if (fstat (fd, &st))
-            msg_Err (p_access, "fstat(%d): %s", fd, strerror (errno));
+            msg_Err (p_access, "fstat(%d): %m", fd);
         else
         if (S_ISDIR (st.st_mode))
             /* The directory plugin takes care of that */
@@ -277,10 +277,9 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len )
                 break;
 
             default:
-                msg_Err (p_access, "read failed (%s)", strerror (errno));
+                msg_Err (p_access, "read failed (%m)");
                 intf_UserFatal (p_access, VLC_FALSE, _("File reading failed"),
-                                _("VLC could not read file \"%s\"."),
-                                strerror (errno));
+                                _("VLC could not read file."));
         }
 
         /* Delay a bit to avoid consuming all the CPU. This is particularly
@@ -383,6 +382,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
         case ACCESS_SET_SEEKPOINT:
         case ACCESS_SET_PRIVATE_ID_STATE:
         case ACCESS_GET_META:
+        case ACCESS_GET_CONTENT_TYPE:
             return VLC_EGENERIC;
 
         default:
@@ -445,11 +445,9 @@ static int open_file (access_t *p_access, const char *psz_name)
     free (path);
     if (fd == -1)
     {
-        msg_Err (p_access, "cannot open file %s (%s)", psz_name,
-                 strerror (errno));
+        msg_Err (p_access, "cannot open file %s (%m)", psz_name);
         intf_UserFatal (p_access, VLC_FALSE, _("File reading failed"),
-                        _("VLC could not open file \"%s\" (%s)."),
-                        psz_name, strerror (errno));
+                        _("VLC could not open file \"%s\"."), psz_name);
         return -1;
     }