diff options
| author | Alan Antonuk <alan.antonuk@gmail.com> | 2015-04-21 22:06:50 -0700 |
|---|---|---|
| committer | Alan Antonuk <alan.antonuk@gmail.com> | 2015-05-03 20:24:02 -0700 |
| commit | a1326beab0054f35cf607297ae47ed3330086585 (patch) | |
| tree | 43b81cbc32ce6f8bb8c1e99238a7e7acd6100433 /librabbitmq/amqp_openssl.c | |
| parent | afc59a400c4be1deea1b7fecbee782be3a994c87 (diff) | |
| download | rabbitmq-c-a1326beab0054f35cf607297ae47ed3330086585.tar.gz | |
Rename amqp_timer_t related functions.
Rename amqp_timer_t related functions to improve readability of the code and
clarify what they do.
Diffstat (limited to 'librabbitmq/amqp_openssl.c')
| -rw-r--r-- | librabbitmq/amqp_openssl.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/librabbitmq/amqp_openssl.c b/librabbitmq/amqp_openssl.c index 833f5a2..cd9707c 100644 --- a/librabbitmq/amqp_openssl.c +++ b/librabbitmq/amqp_openssl.c @@ -302,7 +302,7 @@ amqp_ssl_socket_open(void *base, const char *host, int port, struct timeval *tim struct amqp_ssl_socket_t *self = (struct amqp_ssl_socket_t *)base; long result; int status; - amqp_timer_t timer; + amqp_time_t deadline; if (-1 != self->sockfd) { return AMQP_STATUS_SOCKET_INUSE; } @@ -315,12 +315,12 @@ amqp_ssl_socket_open(void *base, const char *host, int port, struct timeval *tim goto exit; } - status = amqp_timer_start(&timer, timeout); + status = amqp_time_from_now(&deadline, timeout); if (AMQP_STATUS_OK != status) { return status; } - self->sockfd = amqp_open_socket_inner(host, port, timer); + self->sockfd = amqp_open_socket_inner(host, port, deadline); if (0 > self->sockfd) { status = self->sockfd; self->internal_error = amqp_os_socket_error(); @@ -341,10 +341,10 @@ start_connect: self->internal_error = SSL_get_error(self->ssl, status); switch (self->internal_error) { case SSL_ERROR_WANT_READ: - status = amqp_poll_read(self->sockfd, timer); + status = amqp_poll_read(self->sockfd, deadline); break; case SSL_ERROR_WANT_WRITE: - status = amqp_poll_write(self->sockfd, timer); + status = amqp_poll_write(self->sockfd, deadline); break; default: status = AMQP_STATUS_SSL_CONNECTION_FAILED; @@ -405,10 +405,10 @@ start_shutdown: self->internal_error = SSL_get_error(self->ssl, res); switch (self->internal_error) { case SSL_ERROR_WANT_READ: - res = amqp_poll_read(self->sockfd, amqp_timer_start_infinite()); + res = amqp_poll_read(self->sockfd, amqp_time_infinite()); break; case SSL_ERROR_WANT_WRITE: - res = amqp_poll_write(self->sockfd, amqp_timer_start_infinite()); + res = amqp_poll_write(self->sockfd, amqp_time_infinite()); break; } if (AMQP_STATUS_OK == res) { |