[vlc-commits] file: remove useless seek callback

Rémi Denis-Courmont git at videolan.org
Wed Jun 19 20:27:21 CEST 2019


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Jun 18 19:17:26 2019 +0300| [0c1bc2597812333d6572305dedb979cc841868b3] | committer: Rémi Denis-Courmont

file: remove useless seek callback

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

 modules/access/file.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/modules/access/file.c b/modules/access/file.c
index 62d959a8c8..537a2493aa 100644
--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -127,7 +127,6 @@ static bool IsRemote (const char *path)
 
 static ssize_t Read (stream_t *, void *, size_t);
 static int FileSeek (stream_t *, uint64_t);
-static int NoSeek (stream_t *, uint64_t);
 static int FileControl (stream_t *, int, va_list);
 
 /*****************************************************************************
@@ -233,7 +232,7 @@ int FileOpen( vlc_object_t *p_this )
     }
     else
     {
-        p_access->pf_seek = NoSeek;
+        p_access->pf_seek = NULL;
         p_sys->b_pace_control = strcasecmp (p_access->psz_name, "stream");
     }
 
@@ -297,13 +296,6 @@ static int FileSeek (stream_t *p_access, uint64_t i_pos)
     return VLC_SUCCESS;
 }
 
-static int NoSeek (stream_t *p_access, uint64_t i_pos)
-{
-    /* vlc_assert_unreachable(); ?? */
-    (void) p_access; (void) i_pos;
-    return VLC_EGENERIC;
-}
-
 /*****************************************************************************
  * Control:
  *****************************************************************************/
@@ -318,7 +310,7 @@ static int FileControl( stream_t *p_access, int i_query, va_list args )
         case STREAM_CAN_SEEK:
         case STREAM_CAN_FASTSEEK:
             pb_bool = va_arg( args, bool * );
-            *pb_bool = (p_access->pf_seek != NoSeek);
+            *pb_bool = (p_access->pf_seek != NULL);
             break;
 
         case STREAM_CAN_PAUSE:



More information about the vlc-commits mailing list