diff options
| author | teor <teor@torproject.org> | 2019-10-23 22:59:16 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-10-23 22:59:16 +1000 |
| commit | 34509e78c6280a103eb243865ce52a70f4a665d0 (patch) | |
| tree | 8ef73ca409b1fe2e5c85d0c1a171fe8d40345606 /src/feature | |
| parent | 71191fa3dcc29d24aee9a22d1d9f2584316e818f (diff) | |
| parent | 04addabb0426f2f564f4f0914568b2fa227a8f54 (diff) | |
| download | tor-34509e78c6280a103eb243865ce52a70f4a665d0.tar.gz tor-34509e78c6280a103eb243865ce52a70f4a665d0.zip | |
Merge remote-tracking branch 'tor-github/pr/1449'
Diffstat (limited to 'src/feature')
| -rw-r--r-- | src/feature/dirauth/shared_random_state.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/feature/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c index 474dcb2711..94743fdb76 100644 --- a/src/feature/dirauth/shared_random_state.c +++ b/src/feature/dirauth/shared_random_state.c @@ -60,8 +60,7 @@ DUMMY_TYPECHECK_INSTANCE(sr_disk_state_t); #define SR_DISK_STATE_MAGIC 0x98AB1254 static int -disk_state_validate_cb(void *old_state, void *state, void *default_state, - int from_setconf, char **msg); +disk_state_validate_cb(const void *old_state, void *state, char **msg); /** Array of variables that are saved to disk as a persistent state. */ static const config_var_t state_vars[] = { @@ -345,12 +344,9 @@ disk_state_validate(const sr_disk_state_t *state) /** Validate the disk state (NOP for now). */ static int -disk_state_validate_cb(void *old_state, void *state, void *default_state, - int from_setconf, char **msg) +disk_state_validate_cb(const void *old_state, void *state, char **msg) { /* We don't use these; only options do. */ - (void) from_setconf; - (void) default_state; (void) old_state; /* This is called by config_dump which is just before we are about to |