Merge branch 'master' into lpcm_encoder

[vlc] / modules / access / sftp.c

diff --git a/modules/access/sftp.c b/modules/access/sftp.c
index ce253cf64beb76eb7ee7453be7a9cd9ba6f0bdec..9c451a62465561171066971ee10ca6b3992ad025 100644 (file)
--- a/modules/access/sftp.c
+++ b/modules/access/sftp.c
@@ -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 );