From 0d74d82c742b2e5ba462a7a2cfa2f82ff4d2ddf3 Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 15 Sep 2007 11:03:38 +0000 Subject: Get rid of bloated ty_extension function git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24520 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_ty.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'libmpdemux/demux_ty.c') diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c index 5f5bdcc350..fe4663b1c5 100644 --- a/libmpdemux/demux_ty.c +++ b/libmpdemux/demux_ty.c @@ -109,16 +109,6 @@ void ty_ClearOSD( int start ); // =========================================================================== #define TMF_SIG "showing.xml" -// =========================================================================== -static int ty_extension(const char *name, const char *ext ) -{ - int delta = strlen(name) - strlen(ext); - if (delta < 0) return 0; - name += delta; - return strcmp(name, ext) == 0; -} - - // =========================================================================== static int ty_tmf_filetoparts( demuxer_t *demux, TiVoInfo *tivo ) { @@ -134,6 +124,7 @@ static int ty_tmf_filetoparts( demuxer_t *demux, TiVoInfo *tivo ) { char header[ 512 ]; char *name; + char *extension; char *sizestr; int size; off_t skip; @@ -160,7 +151,8 @@ static int ty_tmf_filetoparts( demuxer_t *demux, TiVoInfo *tivo ) if ( offset + skip > totalsize ) size = totalsize - offset; - isty = ty_extension( name, ".ty" ); + extension = strrchr(name, '.'); + isty = extension && strcmp(extension, ".ty") == 0; mp_msg( MSGT_DEMUX, MSGL_DBG3, "name %-20.20s size %-12.12s %d %d\n", name, sizestr, size, isty ); -- cgit v1.2.3