diff --git a/include/libssh/sftp.h b/include/libssh/sftp.h index 6d6d71a2..0293f29b 100644 --- a/include/libssh/sftp.h +++ b/include/libssh/sftp.h @@ -47,12 +47,6 @@ extern "C" { #endif -#ifdef __GNUC__ -#define SFTP_DEPRECATED __attribute__ ((deprecated)) -#else -#define SFTP_DEPRECATED -#endif - #ifdef _WIN32 #ifndef uid_t typedef uint32_t uid_t; @@ -381,11 +375,6 @@ LIBSSH_API void sftp_attributes_free(sftp_attributes file); */ LIBSSH_API int sftp_closedir(sftp_dir dir); -/** - * @deprecated Use sftp_closedir() instead. - */ -LIBSSH_API int sftp_dir_close(sftp_dir dir) SFTP_DEPRECATED; - /** * @brief Close an open file handle. * @@ -397,11 +386,6 @@ LIBSSH_API int sftp_dir_close(sftp_dir dir) SFTP_DEPRECATED; */ LIBSSH_API int sftp_close(sftp_file file); -/** - * @deprecated Use sftp_close() instead. - */ -LIBSSH_API int sftp_file_close(sftp_file file) SFTP_DEPRECATED; - /** * @brief Open a file on the server. * @@ -578,11 +562,6 @@ LIBSSH_API uint64_t sftp_tell64(sftp_file file); */ LIBSSH_API void sftp_rewind(sftp_file file); -/** - * @deprecated Use sftp_unlink() instead. - */ -LIBSSH_API int sftp_rm(sftp_session sftp, const char *file) SFTP_DEPRECATED; - /** * @brief Unlink (delete) a file. * diff --git a/libssh/sftp.c b/libssh/sftp.c index 46bcce32..f657e4a1 100644 --- a/libssh/sftp.c +++ b/libssh/sftp.c @@ -1453,10 +1453,6 @@ static int sftp_handle_close(sftp_session sftp, ssh_string handle) { return -1; } -int sftp_file_close(sftp_file file) { - return sftp_close(file); -} - /* Close an open file handle. */ int sftp_close(sftp_file file){ int err = SSH_NO_ERROR; @@ -1472,10 +1468,6 @@ int sftp_close(sftp_file file){ return err; } -int sftp_dir_close(sftp_dir dir) { - return sftp_closedir(dir); -} - /* Close an open directory. */ int sftp_closedir(sftp_dir dir){ int err = SSH_NO_ERROR; @@ -1922,11 +1914,6 @@ void sftp_rewind(sftp_file file) { file->offset = 0; } -/* deprecated */ -int sftp_rm(sftp_session sftp, const char *file) { - return sftp_unlink(sftp, file); -} - /* code written by Nick */ int sftp_unlink(sftp_session sftp, const char *file) { sftp_status_message status = NULL;