diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-10-22 13:52:40 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-10-22 13:52:40 -0400 |
| commit | 697d99e50411b29eeb82667a870bd10c5efa9509 (patch) | |
| tree | 46ba4cdd127232036743d04506dd51d742e2de93 /src/app | |
| parent | 91413e04b458f41334ea4e25e35829043956b742 (diff) | |
| download | tor-697d99e50411b29eeb82667a870bd10c5efa9509.tar.gz tor-697d99e50411b29eeb82667a870bd10c5efa9509.zip | |
validate_fn(): remove now-unused defaults and from_setconf.
These arguments were only used by options_validate, and are now
ignored even there.
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/config/config.c | 9 | ||||
| -rw-r--r-- | src/app/config/statefile.c | 10 |
2 files changed, 6 insertions, 13 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index 337ae93575..be243a0d8c 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -844,8 +844,7 @@ static int parse_outbound_addresses(or_options_t *options, int validate_only, static void config_maybe_load_geoip_files_(const or_options_t *options, const or_options_t *old_options); static int options_validate_cb(void *old_options, void *options, - void *default_options, - int from_setconf, char **msg); + char **msg); static void cleanup_protocol_warning_severity_level(void); static void set_protocol_warning_severity_level(int warning_severity); static void options_clear_cb(const config_mgr_t *mgr, void *opts); @@ -3231,12 +3230,10 @@ compute_publishserverdescriptor(or_options_t *options) #define RECOMMENDED_MIN_CIRCUIT_BUILD_TIMEOUT (10) static int -options_validate_cb(void *old_options, void *options, void *default_options, - int from_setconf, char **msg) +options_validate_cb(void *old_options, void *options, char **msg) { in_option_validation = 1; - int rv = options_validate(old_options, options, default_options, - from_setconf, msg); + int rv = options_validate(old_options, options, NULL, 0, msg); in_option_validation = 0; return rv; } diff --git a/src/app/config/statefile.c b/src/app/config/statefile.c index 552bd2c443..3653deeee1 100644 --- a/src/app/config/statefile.c +++ b/src/app/config/statefile.c @@ -141,9 +141,8 @@ static const config_var_t state_vars_[] = { static int or_state_validate(or_state_t *state, char **msg); -static int or_state_validate_cb(void *old_options, void *options, - void *default_options, - int from_setconf, char **msg); +static int or_state_validate_cb(void *old_options, + void *options, char **msg); /** Magic value for or_state_t. */ #define OR_STATE_MAGIC 0x57A73f57 @@ -269,13 +268,10 @@ validate_transports_in_state(or_state_t *state) } static int -or_state_validate_cb(void *old_state, void *state, void *default_state, - int from_setconf, char **msg) +or_state_validate_cb(void *old_state, void *state, char **msg) { /* We don't use these; only options do. Still, we need to match that * signature. */ - (void) from_setconf; - (void) default_state; (void) old_state; return or_state_validate(state, msg); |