diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-07-29 11:37:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-07-31 13:34:16 -0400 |
| commit | 22a074caa71723b35c3a59620f8a2ebdbf290388 (patch) | |
| tree | 1da68b80fa4b22688b86edcf21494e6e223a19e4 /src/or | |
| parent | 99bb6d2937a76caf7d6085fb063d89c1c8b3d9b6 (diff) | |
| download | tor-22a074caa71723b35c3a59620f8a2ebdbf290388.tar.gz tor-22a074caa71723b35c3a59620f8a2ebdbf290388.zip | |
Update pt/configure_proxy until it stops segfaulting
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/statefile.c | 4 | ||||
| -rw-r--r-- | src/or/statefile.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/or/statefile.c b/src/or/statefile.c index bcb7b07417..aac8850b16 100644 --- a/src/or/statefile.c +++ b/src/or/statefile.c @@ -117,8 +117,8 @@ static const config_format_t state_format = { static or_state_t *global_state = NULL; /** Return the persistent state struct for this Tor. */ -or_state_t * -get_or_state(void) +MOCK_IMPL(or_state_t *, +get_or_state, (void)) { tor_assert(global_state); return global_state; diff --git a/src/or/statefile.h b/src/or/statefile.h index dcdee6c604..762b0f5ee1 100644 --- a/src/or/statefile.h +++ b/src/or/statefile.h @@ -7,7 +7,7 @@ #ifndef TOR_STATEFILE_H #define TOR_STATEFILE_H -or_state_t *get_or_state(void); +MOCK_DECL(or_state_t *,get_or_state,(void)); int did_last_state_file_write_fail(void); int or_state_save(time_t now); |