From 915c30cec612932f8db7cd5d99c4f43e214f6102 Mon Sep 17 00:00:00 2001 From: Steven Van Ingelgem Date: Sat, 28 Dec 2019 12:07:06 +0100 Subject: Fix unused parameter warning in amqp_time_tv_until 'in' parameter was not referenced in amqp_time_tv_until as described in the documentation. This brings the implementation inline with what is intended. --- librabbitmq/amqp_time.c | 17 ++++++++++------- librabbitmq/amqp_time.h | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/librabbitmq/amqp_time.c b/librabbitmq/amqp_time.c index b069be9..d3343f6 100644 --- a/librabbitmq/amqp_time.c +++ b/librabbitmq/amqp_time.c @@ -199,7 +199,7 @@ int amqp_time_ms_until(amqp_time_t time) { return left_ms; } -int amqp_time_tv_until(amqp_time_t time, const struct timeval *in, +int amqp_time_tv_until(amqp_time_t time, struct timeval *in, struct timeval **out) { uint64_t now_ns; uint64_t delta_ns; @@ -210,8 +210,9 @@ int amqp_time_tv_until(amqp_time_t time, const struct timeval *in, return AMQP_STATUS_OK; } if (0 == time.time_point_ns) { - (*out)->tv_sec = 0; - (*out)->tv_usec = 0; + in->tv_sec = 0; + in->tv_usec = 0; + *out = in; return AMQP_STATUS_OK; } @@ -221,14 +222,16 @@ int amqp_time_tv_until(amqp_time_t time, const struct timeval *in, } if (now_ns >= time.time_point_ns) { - (*out)->tv_sec = 0; - (*out)->tv_usec = 0; + in->tv_sec = 0; + in->tv_usec = 0; + *out = in; return AMQP_STATUS_OK; } delta_ns = time.time_point_ns - now_ns; - (*out)->tv_sec = (int)(delta_ns / AMQP_NS_PER_S); - (*out)->tv_usec = (int)((delta_ns % AMQP_NS_PER_S) / AMQP_NS_PER_US); + in->tv_sec = (int)(delta_ns / AMQP_NS_PER_S); + in->tv_usec = (int)((delta_ns % AMQP_NS_PER_S) / AMQP_NS_PER_US); + *out = in; return AMQP_STATUS_OK; } diff --git a/librabbitmq/amqp_time.h b/librabbitmq/amqp_time.h index b7a6123..4478671 100644 --- a/librabbitmq/amqp_time.h +++ b/librabbitmq/amqp_time.h @@ -109,7 +109,7 @@ int amqp_time_ms_until(amqp_time_t time); * AMQP_STATUS_TIMER_FAILURE is returned when the underlying call to get the * current timestamp fails. */ -int amqp_time_tv_until(amqp_time_t time, const struct timeval *in, +int amqp_time_tv_until(amqp_time_t time, struct timeval *in, struct timeval **out); /* Test whether current time is past the provided time. -- cgit v1.2.1