diff options
author | Aris Adamantiadis <aris@0xbadc0de.be> | 2009-10-09 22:24:23 +0200 |
---|---|---|
committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2009-10-09 22:24:23 +0200 |
commit | 98ff6fbbcefaa21a5bcc4c032fd7797fc2f8ca68 (patch) | |
tree | 1c9e717dd6e13ec428fed44989798b3783ad2dde /include | |
parent | 43e0d73b636c5ffe2bca2b180a0c5b243318784e (diff) | |
download | libssh-98ff6fbbcefaa21a5bcc4c032fd7797fc2f8ca68.tar.gz libssh-98ff6fbbcefaa21a5bcc4c032fd7797fc2f8ca68.tar.xz libssh-98ff6fbbcefaa21a5bcc4c032fd7797fc2f8ca68.zip |
get rid of the option structure
Diffstat (limited to 'include')
-rw-r--r-- | include/libssh/libssh.h | 9 | ||||
-rw-r--r-- | include/libssh/priv.h | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h index e794893..523269f 100644 --- a/include/libssh/libssh.h +++ b/include/libssh/libssh.h @@ -114,14 +114,14 @@ typedef struct ssh_agent_struct AGENT; #endif typedef struct ssh_message_struct SSH_MESSAGE; -typedef struct ssh_session_struct SSH_OPTIONS; +//typedef struct ssh_session_struct SSH_OPTIONS; typedef struct ssh_session_struct SSH_SESSION; typedef struct ssh_agent_struct* ssh_agent; typedef struct ssh_buffer_struct* ssh_buffer; typedef struct ssh_channel_struct* ssh_channel; typedef struct ssh_message_struct *ssh_message; -typedef struct ssh_session_struct* ssh_options; +//typedef struct ssh_session_struct* ssh_options; typedef struct ssh_private_key_struct* ssh_private_key; typedef struct ssh_public_key_struct* ssh_public_key; typedef struct ssh_scp_struct* ssh_scp; @@ -384,8 +384,8 @@ LIBSSH_API int ssh_mkdir (const char *pathname, mode_t mode); LIBSSH_API ssh_session ssh_new(void); LIBSSH_API int ssh_options_copy(ssh_session src, ssh_session *dest); -LIBSSH_API int ssh_options_getopt(ssh_options options, int *argcptr, char **argv); -LIBSSH_API int ssh_options_parse_config(ssh_options opt, const char *filename); +LIBSSH_API int ssh_options_getopt(ssh_session session, int *argcptr, char **argv); +LIBSSH_API int ssh_options_parse_config(ssh_session session, const char *filename); LIBSSH_API int ssh_options_set(ssh_session session, enum ssh_options_e type, const void *value); @@ -413,7 +413,6 @@ LIBSSH_API void ssh_set_blocking(ssh_session session, int blocking); LIBSSH_API void ssh_set_fd_except(ssh_session session); LIBSSH_API void ssh_set_fd_toread(ssh_session session); LIBSSH_API void ssh_set_fd_towrite(ssh_session session); -LIBSSH_API void ssh_set_options(ssh_session session, ssh_options options); LIBSSH_API void ssh_silent_disconnect(ssh_session session); #ifndef _WIN32 LIBSSH_API int ssh_userauth_agent_pubkey(ssh_session session, const char *username, diff --git a/include/libssh/priv.h b/include/libssh/priv.h index bea4c34..d30eb11 100644 --- a/include/libssh/priv.h +++ b/include/libssh/priv.h @@ -119,7 +119,7 @@ int ssh_send_banner(ssh_session session, int is_server); char *ssh_get_banner(ssh_session session); /* config.c */ -int ssh_config_parse_file(ssh_options opt, const char *filename); +int ssh_config_parse_file(ssh_session session, const char *filename); /* errors.c */ void ssh_set_error(void *error, int code, const char *descr, ...) PRINTF_ATTRIBUTE(3, 4); |