aboutsummaryrefslogtreecommitdiff
path: root/src/feature/control/control.h
diff options
context:
space:
mode:
authorTaylor Yu <catalyst@torproject.org>2018-08-28 13:30:58 -0500
committerTaylor Yu <catalyst@torproject.org>2018-09-10 13:18:32 -0500
commiteee62e13d97e3f07c0d8577f34729f4192738b44 (patch)
treef51df51cf47e9dcd9b73614f7da862caeb6e4763 /src/feature/control/control.h
parentb87a95289b63c891f4e12e0d40f41a39dae5aa7e (diff)
downloadtor-eee62e13d97e3f07c0d8577f34729f4192738b44.tar.gz
tor-eee62e13d97e3f07c0d8577f34729f4192738b44.zip
Make control_event_bootstrap() return void
Simplify control_event_bootstrap() by making it return void again. It is currently a fairly complicated function, and it's made more complicated by returning an int to signal whether it logged at NOTICE or INFO. The callers conditionally log messages at level NOTICE based on this return value. Change the callers to unconditionally log their verbose human-readable messages at level INFO to keep NOTICE logs less cluttered. This partially reverts the changes of #14950.
Diffstat (limited to 'src/feature/control/control.h')
-rw-r--r--src/feature/control/control.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/feature/control/control.h b/src/feature/control/control.h
index 5c5fe8a917..7f57228e5c 100644
--- a/src/feature/control/control.h
+++ b/src/feature/control/control.h
@@ -191,7 +191,7 @@ void enable_control_logging(void);
void monitor_owning_controller_process(const char *process_spec);
-int control_event_bootstrap(bootstrap_status_t status, int progress);
+void control_event_bootstrap(bootstrap_status_t status, int progress);
MOCK_DECL(void, control_event_bootstrap_prob_or,(const char *warn,
int reason,
or_connection_t *or_conn));