hs_pow: review feedback, use MAX for max_trimmed_effort

Signed-off-by: Micah Elizabeth Scott <beth@torproject.org>

diff --git a/src/feature/hs/hs_circuit.c b/src/feature/hs/hs_circuit.c
index 3978c69567dbd58d3f5857cb23f5ad61ddaecb99..1287b2bedace29c3054150e9db3e083ba0d7dea4 100644 (file)
--- a/src/feature/hs/hs_circuit.c
+++ b/src/feature/hs/hs_circuit.c
@@ -680,8 +680,8 @@ trim_rend_pqueue(hs_pow_service_state_t *pow_state, time_t now)
       log_info(LD_REND, "While trimming, rend request has been pending "
                         "for too long; discarding.");
 
-      if (req->rdv_data.pow_effort > pow_state->max_trimmed_effort)
-        pow_state->max_trimmed_effort = req->rdv_data.pow_effort;
+      pow_state->max_trimmed_effort = MAX(pow_state->max_trimmed_effort,
+                                          req->rdv_data.pow_effort);
 
       free_pending_rend(req);
     } else {
@@ -694,9 +694,8 @@ trim_rend_pqueue(hs_pow_service_state_t *pow_state, time_t now)
   /* Ok, we have rescued all the entries we want to keep. The rest are
    * all excess. */
   SMARTLIST_FOREACH_BEGIN(old_pqueue, pending_rend_t *, req) {
-    if (req->rdv_data.pow_effort > pow_state->max_trimmed_effort)
-      pow_state->max_trimmed_effort = req->rdv_data.pow_effort;
-
+    pow_state->max_trimmed_effort = MAX(pow_state->max_trimmed_effort,
+                                        req->rdv_data.pow_effort);
     free_pending_rend(req);
   } SMARTLIST_FOREACH_END(req);
   smartlist_free(old_pqueue);