# HG changeset patch # User reimar # Date 1189854218 0 # Node ID dcb02dadd06caebf92b49cc5c14a2c4c6c021590 # Parent 1e57ce7abdbd0daa737600af215334b7569cef37 Get rid of bloated ty_extension function diff -r 1e57ce7abdbd -r dcb02dadd06c libmpdemux/demux_ty.c --- a/libmpdemux/demux_ty.c Sat Sep 15 10:59:27 2007 +0000 +++ b/libmpdemux/demux_ty.c Sat Sep 15 11:03:38 2007 +0000 @@ -110,16 +110,6 @@ #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 ) { off_t offset; @@ -134,6 +124,7 @@ { char header[ 512 ]; char *name; + char *extension; char *sizestr; int size; off_t skip; @@ -160,7 +151,8 @@ 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 );