From: RĂ©mi Denis-Courmont Date: Thu, 8 Jul 2010 16:40:54 +0000 (+0300) Subject: playlist: simplify with demux psz_location X-Git-Tag: 1.2.0-pre1~5907 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=782865e801093e37cf4d5cc9643ae479f99179fa;p=vlc playlist: simplify with demux psz_location --- diff --git a/modules/demux/playlist/playlist.c b/modules/demux/playlist/playlist.c index 55ae96f465..2a02026a32 100644 --- a/modules/demux/playlist/playlist.c +++ b/modules/demux/playlist/playlist.c @@ -35,6 +35,7 @@ #ifdef WIN32 # include #endif +#include #include "playlist.h" @@ -167,34 +168,17 @@ input_item_t * GetCurrentItem(demux_t *p_demux) */ char *FindPrefix( demux_t *p_demux ) { - char *psz_file; - char *psz_prefix; - char *psz_path; - if( p_demux->psz_access ) - { - if( asprintf( &psz_path,"%s://%s", p_demux->psz_access, p_demux->psz_location ) == -1 ) - return NULL; - } - else - { - psz_path = strdup( p_demux->psz_location ); - if( psz_path == NULL ) - return NULL; - } + char *psz_url; -#ifdef WIN32 - psz_file = strrchr( psz_path, '\\' ); - if( !psz_file ) -#endif - psz_file = strrchr( psz_path, '/' ); + if( asprintf( &psz_url, "%s://%s", p_demux->psz_access, + p_demux->psz_location ) == -1 ) + return NULL; - if( psz_file ) - psz_prefix = strndup( psz_path, psz_file - psz_path + 1 ); - else - psz_prefix = strdup( "" ); - free( psz_path ); + char *psz_file = strrchr( psz_url, '/' ); + assert( psz_file != NULL ); + psz_file[1] = '\0'; - return psz_prefix; + return psz_url; } /**