X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fgnomevfs.c;h=d39d54d36e6457ea31915dc3d113948655c8735d;hb=d475b82a023d7016dba778ea1110999c8c953277;hp=8c5e8fc667a74f67752941aee41f79bd0951f782;hpb=27d483e9ef7a451397d7857251c8d67097661f1d;p=vlc diff --git a/modules/access/gnomevfs.c b/modules/access/gnomevfs.c index 8c5e8fc667..d39d54d36e 100644 --- a/modules/access/gnomevfs.c +++ b/modules/access/gnomevfs.c @@ -24,11 +24,12 @@ /***************************************************************************** * Preamble *****************************************************************************/ + #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include +#include #include #include @@ -36,7 +37,7 @@ #include -#include "vlc_url.h" +#include /***************************************************************************** * Module descriptor @@ -49,24 +50,24 @@ static void Close( vlc_object_t * ); "Caching value for GnomeVFS streams."\ "This value should be set in milliseconds." ) -vlc_module_begin(); - set_description( _("GnomeVFS input") ); - set_shortname( "GnomeVFS" ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); - add_integer( "gnomevfs-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); - set_capability( "access", 10 ); - add_shortcut( "gnomevfs" ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("GnomeVFS input") ) + set_shortname( "GnomeVFS" ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) + add_integer( "gnomevfs-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ) + set_capability( "access", 10 ) + add_shortcut( "gnomevfs" ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Exported prototypes *****************************************************************************/ -static int Seek( access_t *, int64_t ); -static int Read( access_t *, uint8_t *, int ); -static int Control( access_t *, int, va_list ); +static int Seek( access_t *, uint64_t ); +static ssize_t Read( access_t *, uint8_t *, size_t ); +static int Control( access_t *, int, va_list ); struct access_sys_t { @@ -81,6 +82,9 @@ struct access_sys_t bool b_pace_control; }; +/* NOTE: we do not handle memory errors in this plugin. + * Underlying glib does not, so there is no point in doing it here either. */ + /***************************************************************************** * Open: open the file *****************************************************************************/ @@ -116,14 +120,12 @@ static int Open( vlc_object_t *p_this ) if( strcmp( "gnomevfs", p_access->psz_access ) && *(p_access->psz_access) != '\0') { - psz_name = malloc( strlen( p_access->psz_access ) + - strlen( p_access->psz_path ) + 4 ); - sprintf( psz_name, "%s://%s", p_access->psz_access, - p_access->psz_path ); + asprintf( &psz_name, "%s://%s", p_access->psz_access, + p_access->psz_location ); } else { - psz_name = strdup( p_access->psz_path ); + psz_name = strdup( p_access->psz_location ); } psz = ToLocale( psz_name ); psz_expand_tilde = gnome_vfs_expand_initial_tilde( psz ); @@ -156,9 +158,7 @@ static int Open( vlc_object_t *p_this ) psz_path_begin = psz_unescaped + strlen( psz_unescaped ) - strlen( url.psz_path ); *psz_path_begin = '\0'; - psz_uri = malloc( strlen( psz_unescaped ) + - strlen( psz_escaped_path ) + 1 ); - sprintf( psz_uri, "%s%s",psz_unescaped, psz_escaped_path ); + asprintf( &psz_uri, "%s%s", psz_unescaped, psz_escaped_path ); g_free( psz_escaped_path ); g_free( psz_unescaped ); @@ -188,7 +188,7 @@ static int Open( vlc_object_t *p_this ) gnome_vfs_file_info_unref( p_sys->p_file_info ); gnome_vfs_uri_unref( p_uri); free( p_sys ); - g_free( psz_uri ); + free( psz_uri ); free( psz_name ); return VLC_EGENERIC; } @@ -196,7 +196,7 @@ static int Open( vlc_object_t *p_this ) else { msg_Warn( p_access, "cannot parse MRL %s or unsupported protocol", psz_name ); - g_free( psz_uri ); + free( psz_uri ); free( p_sys ); free( psz_name ); return VLC_EGENERIC; @@ -210,7 +210,7 @@ static int Open( vlc_object_t *p_this ) gnome_vfs_result_to_string( i_ret ) ); gnome_vfs_uri_unref( p_uri); - g_free( psz_uri ); + free( psz_uri ); free( p_sys ); free( psz_name ); return VLC_EGENERIC; @@ -246,7 +246,7 @@ static int Open( vlc_object_t *p_this ) gnome_vfs_file_info_unref( p_sys->p_file_info ); gnome_vfs_uri_unref( p_uri); free( p_sys ); - g_free( psz_uri ); + free( psz_uri ); free( psz_name ); return VLC_EGENERIC; } @@ -255,7 +255,7 @@ static int Open( vlc_object_t *p_this ) var_Create( p_access, "gnomevfs-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - g_free( psz_uri ); + free( psz_uri ); p_sys->psz_name = psz_name; gnome_vfs_uri_unref( p_uri); return VLC_SUCCESS; @@ -286,7 +286,7 @@ static void Close( vlc_object_t * p_this ) /***************************************************************************** * Read: standard read on a file descriptor. *****************************************************************************/ -static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) +static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) { access_sys_t *p_sys = p_access->p_sys; GnomeVFSFileSize i_read_len; @@ -339,7 +339,7 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) /***************************************************************************** * Seek: seek to a specific location in a file *****************************************************************************/ -static int Seek( access_t *p_access, int64_t i_pos ) +static int Seek( access_t *p_access, uint64_t i_pos ) { access_sys_t *p_sys = p_access->p_sys; int i_ret; @@ -377,7 +377,6 @@ static int Control( access_t *p_access, int i_query, va_list args ) { access_sys_t *p_sys = p_access->p_sys; bool *pb_bool; - int *pi_int; int64_t *pi_64; switch( i_query ) @@ -395,12 +394,6 @@ static int Control( access_t *p_access, int i_query, va_list args ) *pb_bool = p_sys->b_pace_control; break; - /* */ - case ACCESS_GET_MTU: - pi_int = (int*)va_arg( args, int * ); - *pi_int = 0; - break; - case ACCESS_GET_PTS_DELAY: pi_64 = (int64_t*)va_arg( args, int64_t * ); *pi_64 = var_GetInteger( p_access,