* Local prototypes
*****************************************************************************/
static block_t* Block( access_t * );
-static int Seek( access_t *, int64_t );
+static int Seek( access_t *, uint64_t );
static int Control( access_t *, int, va_list );
int i_ret;
vlc_url_t url;
- if( !p_access->psz_path )
+ if( !p_access->psz_location )
return VLC_EGENERIC;
STANDARD_BLOCK_ACCESS_INIT;
/* Parse the URL */
- char* path = p_access->psz_path;
+ const char* path = p_access->psz_location;
vlc_UrlParse( &url, path, 0 );
/* Check for some parameters */
else
{
dialog_Login( p_access, &psz_username, &psz_password,
- _("SFTP authentification"),
+ _("SFTP authentication"),
_("Please enter a valid login and password for the sftp "
"connexion to %s"), url.psz_host );
if( EMPTY_STR(psz_username) || !psz_password )
goto error;
}
- /* Get some informations */
+ /* Get some information */
LIBSSH2_SFTP_ATTRIBUTES attributes;
if( libssh2_sftp_stat( p_sys->sftp_session, url.psz_path, &attributes ) )
{
- msg_Err( p_access, "Impossible to get informations about the remote file %s", url.psz_path );
+ msg_Err( p_access, "Impossible to get information about the remote file %s", url.psz_path );
goto error;
}
p_access->info.i_size = attributes.filesize;
vlc_UrlClean( &url );
return VLC_SUCCESS;
-
error:
free( psz_password );
free( psz_username );
- if( p_sys )
- {
- vlc_UrlClean( &url );
- free( p_sys );
- }
+ vlc_UrlClean( &url );
+ free( p_sys );
return VLC_EGENERIC;
}
}
-static int Seek( access_t* p_access, int64_t i_pos )
+static int Seek( access_t* p_access, uint64_t i_pos )
{
p_access->info.i_pos = i_pos;
p_access->info.b_eof = false;
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t* );
- *pi_64 = (int64_t)var_GetInteger( p_access, "sftp-caching" ) * INT64_C(1000);
+ *pi_64 = var_GetInteger( p_access, "sftp-caching" ) * INT64_C(1000);
break;
case ACCESS_SET_PAUSE_STATE: