Merge branch 'master' into lpcm_encoder

[vlc] / modules / access / sftp.c

diff --git a/modules/access/sftp.c b/modules/access/sftp.c
index eaf355016dad753ddd6f584f8e87acd76d8b7c01..9c451a62465561171066971ee10ca6b3992ad025 100644 (file)
--- a/modules/access/sftp.c
+++ b/modules/access/sftp.c
@@ -79,7 +79,7 @@ vlc_module_end ()
  * 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 );
 
 
@@ -109,13 +109,13 @@ static int Open( vlc_object_t* p_this )
     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 */
@@ -134,7 +134,7 @@ static int Open( vlc_object_t* p_this )
     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 )
@@ -142,7 +142,7 @@ static int Open( vlc_object_t* p_this )
     }
 
     if( url.i_port <= 0 )
-        i_port = var_CreateGetInteger( p_access, "sftp-port" );
+        i_port = var_InheritInteger( p_access, "sftp-port" );
     else
         i_port = url.i_port;
 
@@ -198,18 +198,18 @@ static int Open( vlc_object_t* p_this )
         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;
 
     /* Create the two variables */
     var_Create( p_access, "sftp-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-    p_sys->i_read_size = var_CreateGetInteger( p_access, "sftp-readsize" );
+    p_sys->i_read_size = var_InheritInteger( p_access, "sftp-readsize" );
 
     free( psz_password );
     free( psz_username );
@@ -274,7 +274,7 @@ static block_t* Block( access_t* p_access )
 }
 
 
-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;
@@ -309,7 +309,7 @@ static int Control( access_t* p_access, int i_query, va_list args )
 
     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: