[tor-commits] [tor/master] Refactor control_event_bootstrap_core() more

[nickm at torproject.org]

commit 5733d3f71f0094c2eade64795521321cd653855b
Author: Taylor Yu <catalyst at torproject.org>
Date:   Tue Aug 28 14:52:44 2018 -0500

    Refactor control_event_bootstrap_core() more
    
    Eliminate a few conditional expressions in
    control_event_bootstrap_core() by overwriting the status parameter.
---
 src/feature/control/control.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/feature/control/control.c b/src/feature/control/control.c
index 4395cbd2c..64785a758 100644
--- a/src/feature/control/control.c
+++ b/src/feature/control/control.c
@@ -7106,12 +7106,15 @@ control_event_bootstrap_core(int loglevel, bootstrap_status_t status,
   const char *tag, *summary;
 
   bootstrap_status_to_string(status, &tag, &summary);
+  /* Locally reset status if there's incremental progress */
+  if (progress)
+    status = progress;
 
   tor_log(loglevel, LD_CONTROL,
-          "Bootstrapped %d%%: %s", progress ? progress : status, summary);
+          "Bootstrapped %d%%: %s", status, summary);
   tor_snprintf(buf, sizeof(buf),
                "BOOTSTRAP PROGRESS=%d TAG=%s SUMMARY=\"%s\"",
-               progress ? progress : status, tag, summary);
+               status, tag, summary);
   tor_snprintf(last_sent_bootstrap_message,
                sizeof(last_sent_bootstrap_message),
                "NOTICE %s", buf);