retry_init doesn't need to return anything

diff --git a/src/lib/unlang/module.c b/src/lib/unlang/module.c
index 082dc9d991a681655d4cf9ba37f27be1213a80bc..fc81efb8025dd21a914761d7c32d3657ac388259 100644 (file)
--- a/src/lib/unlang/module.c
+++ b/src/lib/unlang/module.c
@@ -994,7 +994,7 @@ static unlang_action_t unlang_module(rlm_rcode_t *p_result, request_t *request,
                if (fr_time_delta_ispos(frame->instruction->actions.retry.irt)) {
                        fr_assert(fr_time_gt(now, fr_time_wrap(0)));
 
-                       (void) fr_retry_init(&state->retry, now, &frame->instruction->actions.retry); /* can't fail */
+                       fr_retry_init(&state->retry, now, &frame->instruction->actions.retry);
 
                        if (fr_event_timer_at(request, unlang_interpret_event_list(request),
                                              &state->ev, state->retry.next,

diff --git a/src/lib/util/retry.c b/src/lib/util/retry.c
index 008f7842781994134580b8bd88b7d4d618334e8e..567d733d6d4afd7897612e134b3fc963936829ef 100644 (file)
--- a/src/lib/util/retry.c
+++ b/src/lib/util/retry.c
@@ -33,7 +33,7 @@ RCSID("$Id$")
  * @param now when the retransmission starts
  * @param config the counters to track.  They shouldn't change while the retransmission is happening
  */
-int fr_retry_init(fr_retry_t *r, fr_time_t now, fr_retry_config_t const *config)
+void fr_retry_init(fr_retry_t *r, fr_time_t now, fr_retry_config_t const *config)
 {
        uint64_t                scale;
        fr_time_delta_t         rt;
@@ -61,8 +61,6 @@ int fr_retry_init(fr_retry_t *r, fr_time_t now, fr_retry_config_t const *config)
 
        r->rt = rt;
        r->next = fr_time_add(now, rt);
-
-       return 0;
 }
 
 /** Initialize a retransmission counter

diff --git a/src/lib/util/retry.h b/src/lib/util/retry.h
index 208a268c94bdbca7c9f08639f9ed19c828bd582e..9d035f1291c1f4ea74f47cf36f2d8fe5f33bf2c1 100644 (file)
--- a/src/lib/util/retry.h
+++ b/src/lib/util/retry.h
@@ -57,7 +57,7 @@ typedef enum {
        FR_RETRY_MRD,                                   //!< reached maximum retransmission duration
 } fr_retry_state_t;
 
-int            fr_retry_init(fr_retry_t *r, fr_time_t now, fr_retry_config_t const *config) CC_HINT(nonnull);
+void           fr_retry_init(fr_retry_t *r, fr_time_t now, fr_retry_config_t const *config) CC_HINT(nonnull);
 fr_retry_state_t fr_retry_next(fr_retry_t *r, fr_time_t now) CC_HINT(nonnull);
 
 #ifdef __cplusplus

diff --git a/src/modules/rlm_radius/rlm_radius_udp.c b/src/modules/rlm_radius/rlm_radius_udp.c
index c7dd69033e020c9ac6066ce925233744ac82862d..9f4cb8c9953da319c8ff34e4ca257fdb82856e36 100644 (file)
--- a/src/modules/rlm_radius/rlm_radius_udp.c
+++ b/src/modules/rlm_radius/rlm_radius_udp.c
@@ -626,7 +626,7 @@ static void conn_writable_status_check(fr_event_list_t *el, UNUSED int fd, UNUSE
        if (fr_time_eq(u->retry.start, fr_time_wrap(0))) {
                u->id = fr_rand() & 0xff;       /* We don't care what the value is here */
                h->status_checking = true;      /* Ensure this is valid */
-               (void) fr_retry_init(&u->retry, fr_time(), &h->inst->parent->retry[u->code]);
+               fr_retry_init(&u->retry, fr_time(), &h->inst->parent->retry[u->code]);
 
        /*
         *      Status checks can never be retransmitted
@@ -1742,7 +1742,7 @@ static void request_mux(fr_event_list_t *el,
                 *      Start retransmissions from when the socket is writable.
                 */
                if (fr_time_eq(u->retry.start, fr_time_wrap(0))) {
-                       (void) fr_retry_init(&u->retry, fr_time(), &h->inst->parent->retry[u->code]);
+                       fr_retry_init(&u->retry, fr_time(), &h->inst->parent->retry[u->code]);
                        fr_assert(fr_time_delta_ispos(u->retry.rt));
                        fr_assert(fr_time_gt(u->retry.next, fr_time_wrap(0)));
                }

diff --git a/src/modules/rlm_tacacs/rlm_tacacs_tcp.c b/src/modules/rlm_tacacs/rlm_tacacs_tcp.c
index 7061fe7ed777f16119c273b521ec0fc62d76262a..353bbfa2935079f7cb3c1f02c219f57eea8b3714 100644 (file)
--- a/src/modules/rlm_tacacs/rlm_tacacs_tcp.c
+++ b/src/modules/rlm_tacacs/rlm_tacacs_tcp.c
@@ -856,7 +856,7 @@ static void request_mux(fr_event_list_t *el,
                /*
                 *      Start retransmissions from when the socket is writable.
                 */
-               (void) fr_retry_init(&u->retry, fr_time(), &h->inst->parent->retry);
+               fr_retry_init(&u->retry, fr_time(), &h->inst->parent->retry);
                fr_assert(fr_time_delta_ispos(u->retry.rt));
                fr_assert(fr_time_gt(u->retry.next, fr_time_wrap(0)));