diff options
| author | Aris Adamantiadis <aris@0xbadc0de.be> | 2010-05-10 22:01:09 +0200 |
|---|---|---|
| committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2010-05-10 22:01:09 +0200 |
| commit | 4a21b6f1689be7f6d11c221e4b4f6392976ddb70 (patch) | |
| tree | 6f75645e9d015168214e30c41b26069d0fa9f8f7 | |
| parent | fe16cce405665afa32ba3623ce4337a2d6007037 (diff) | |
| download | libssh-4a21b6f1689be7f6d11c221e4b4f6392976ddb70.tar.gz libssh-4a21b6f1689be7f6d11c221e4b4f6392976ddb70.tar.xz libssh-4a21b6f1689be7f6d11c221e4b4f6392976ddb70.zip | |
Some grammarnazi things + fix int->socket_t
| -rw-r--r-- | include/libssh/poll.h | 7 | ||||
| -rw-r--r-- | libssh/keyfiles.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/libssh/poll.h b/include/libssh/poll.h index ab00139..2951245 100644 --- a/include/libssh/poll.h +++ b/include/libssh/poll.h @@ -81,7 +81,8 @@ typedef struct ssh_poll_ctx_struct *ssh_poll_ctx; typedef struct ssh_poll_handle_struct *ssh_poll_handle; /** - * @brief SSH poll callback. + * @brief SSH poll callback. This callback will be used when an event + * caught on the socket. * * @param p Poll object this callback belongs to. * @param fd The raw socket. @@ -89,9 +90,9 @@ typedef struct ssh_poll_handle_struct *ssh_poll_handle; * @param userdata Userdata to be passed to the callback function. * * @return 0 on success, < 0 if you removed the poll object from - * it's poll context. + * its poll context. */ -typedef int (*ssh_poll_callback)(ssh_poll_handle p, int fd, int revents, +typedef int (*ssh_poll_callback)(ssh_poll_handle p, socket_t fd, int revents, void *userdata); diff --git a/libssh/keyfiles.c b/libssh/keyfiles.c index e9ea3aa..8f63729 100644 --- a/libssh/keyfiles.c +++ b/libssh/keyfiles.c @@ -716,7 +716,7 @@ ssh_private_key privatekey_from_file(ssh_session session, const char *filename, #elif defined HAVE_LIBCRYPTO dsa = PEM_read_DSAPrivateKey(file, NULL, pem_get_password, session); } else { /* authcb */ - /* openssl uses it's own callback to get the passphrase here */ + /* openssl uses its own callback to get the passphrase here */ dsa = PEM_read_DSAPrivateKey(file, NULL, NULL, NULL); } /* authcb */ } else { /* passphrase */ @@ -755,7 +755,7 @@ ssh_private_key privatekey_from_file(ssh_session session, const char *filename, #elif defined HAVE_LIBCRYPTO rsa = PEM_read_RSAPrivateKey(file, NULL, pem_get_password, session); } else { /* authcb */ - /* openssl uses it's own callback to get the passphrase here */ + /* openssl uses its own callback to get the passphrase here */ rsa = PEM_read_RSAPrivateKey(file, NULL, NULL, NULL); } /* authcb */ } else { /* passphrase */ |