[tor-commits] [tor/master] Make options_init_logs STATIC for testing.

[nickm@xxxxxxxxxxxxxx]

commit ac3136a6fb52500d849db7622b4af0af42038a91
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Oct 17 15:28:07 2019 -0400

    Make options_init_logs STATIC for testing.
---
 src/app/config/config.c | 4 +---
 src/app/config/config.h | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index 0a8c0d536..1c04dcaf0 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -836,8 +836,6 @@ static int check_server_ports(const smartlist_t *ports,
 static int validate_data_directories(or_options_t *options);
 static int write_configuration_file(const char *fname,
                                     const or_options_t *options);
-static int options_init_logs(const or_options_t *old_options,
-                             or_options_t *options, int validate_only);
 
 static void init_libevent(const or_options_t *options);
 static int opt_streq(const char *s1, const char *s2);
@@ -5676,7 +5674,7 @@ open_and_add_file_log(const log_severity_list_t *severity,
 /**
  * Initialize the logs based on the configuration file.
  */
-static int
+STATIC int
 options_init_logs(const or_options_t *old_options, or_options_t *options,
                   int validate_only)
 {
diff --git a/src/app/config/config.h b/src/app/config/config.h
index e5b687c31..0c61fc7c0 100644
--- a/src/app/config/config.h
+++ b/src/app/config/config.h
@@ -309,6 +309,8 @@ STATIC uint64_t compute_real_max_mem_in_queues(const uint64_t val,
 STATIC int open_and_add_file_log(const log_severity_list_t *severity,
                                  const char *fname,
                                  int truncate_log);
+STATIC int options_init_logs(const or_options_t *old_options,
+                             or_options_t *options, int validate_only);
 
 #endif /* defined(CONFIG_PRIVATE) */
 



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits