summaryrefslogtreecommitdiff
path: root/src/or/shared_random_state.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-08-19 19:58:51 -0400
committerNick Mathewson <nickm@torproject.org>2016-08-19 19:58:51 -0400
commit507f07de098a14d54dfc2a2fdc603b49d563ef01 (patch)
tree3e2f6b5ea4b0cf69768d668d8481f65528d8a457 /src/or/shared_random_state.c
parent5aad921e3a02cd96158cc54d309d072ed21b3aba (diff)
parentf5dcab8072e4f8471cc0d4d8a28c79272467fb92 (diff)
downloadtor-507f07de098a14d54dfc2a2fdc603b49d563ef01.tar.gz
tor-507f07de098a14d54dfc2a2fdc603b49d563ef01.zip
Merge remote-tracking branch 'public/deprecation_v2'
Diffstat (limited to 'src/or/shared_random_state.c')
-rw-r--r--src/or/shared_random_state.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/shared_random_state.c b/src/or/shared_random_state.c
index 655b95002a..87db9031ee 100644
--- a/src/or/shared_random_state.c
+++ b/src/or/shared_random_state.c
@@ -86,6 +86,7 @@ static const config_format_t state_format = {
SR_DISK_STATE_MAGIC,
STRUCT_OFFSET(sr_disk_state_t, magic_),
NULL,
+ NULL,
state_vars,
disk_state_validate_cb,
&state_extra_var,
@@ -700,7 +701,7 @@ disk_state_load_from_disk_impl(const char *fname)
}
disk_state = disk_state_new(time(NULL));
- config_assign(&state_format, disk_state, lines, 0, 0, &errmsg);
+ config_assign(&state_format, disk_state, lines, 0, &errmsg);
config_free_lines(lines);
if (errmsg) {
log_warn(LD_DIR, "SR: Reading state error: %s", errmsg);