diff options
| author | teor <teor@torproject.org> | 2020-03-21 04:01:00 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2020-03-21 04:01:00 +1000 |
| commit | 52f61ec83ea8fd2641ca8cae111b2437d8114aa1 (patch) | |
| tree | 228f84c0c72c0f214c98e473a3e8b894f9145170 /src/app | |
| parent | e380396d423deded74e6c0e6f6f767a1cc93df04 (diff) | |
| parent | 5e2f31f177d106388021f18c9077b656bf494fec (diff) | |
| download | tor-52f61ec83ea8fd2641ca8cae111b2437d8114aa1.tar.gz tor-52f61ec83ea8fd2641ca8cae111b2437d8114aa1.zip | |
Merge branch 'bug32588_042' into bug32588_043
Merge static function declaration deletions from bug32588_042 and
maint-0.4.3 in app/config/config.c.
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/config/config.c | 5 | ||||
| -rw-r--r-- | src/app/config/config.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index bbf984ad08..d79cd8cb72 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -823,9 +823,6 @@ static char *get_windows_conf_root(void); static int options_check_transition_cb(const void *old, const void *new, char **msg); -static int parse_ports(or_options_t *options, int validate_only, - char **msg_out, int *n_ports_out, - int *world_writable_control_socket); static int validate_data_directories(or_options_t *options); static int write_configuration_file(const char *fname, const or_options_t *options); @@ -6557,7 +6554,7 @@ port_count_real_listeners(const smartlist_t *ports, int listenertype, * If <b>validate_only</b> is false, set configured_client_ports to the * new list of ports parsed from <b>options</b>. **/ -static int +STATIC int parse_ports(or_options_t *options, int validate_only, char **msg, int *n_ports_out, int *world_writable_control_socket) diff --git a/src/app/config/config.h b/src/app/config/config.h index 04d877e9da..311e27917a 100644 --- a/src/app/config/config.h +++ b/src/app/config/config.h @@ -319,6 +319,10 @@ int options_validate(const or_options_t *old_options, char **msg); #endif +STATIC int parse_ports(or_options_t *options, int validate_only, + char **msg, int *n_ports_out, + int *world_writable_control_socket); + #endif /* defined(CONFIG_PRIVATE) */ #endif /* !defined(TOR_CONFIG_H) */ |