diff options
author | Nick Mathewson <nickm@torproject.org> | 2016-10-13 09:17:41 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2016-10-13 09:19:51 -0400 |
commit | 49d7feb8a0ecf7e3bc54c5cd7e0d2a96decdf08e (patch) | |
tree | 6d0cd2b85e0bfae82a1a8d7b3d8f90326bcd363f /src/or/config.h | |
parent | 1fc3e291083493bd7517901f467a7341d5c6f650 (diff) | |
download | tor-49d7feb8a0ecf7e3bc54c5cd7e0d2a96decdf08e.tar.gz tor-49d7feb8a0ecf7e3bc54c5cd7e0d2a96decdf08e.zip |
Tweak patch for 18529.
- function doesn't need to be inline.
- rename function
- Make documentation more pedantically correct
- Remove needless "? 1 : 0."
Diffstat (limited to 'src/or/config.h')
-rw-r--r-- | src/or/config.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/or/config.h b/src/or/config.h index 1b40efc5ec..89429329f3 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -76,7 +76,7 @@ MOCK_DECL(char *, #define get_datadir_fname_suffix(sub1, suffix) \ get_datadir_fname2_suffix((sub1), NULL, (suffix)) -inline int is_default_dir_authorities(const or_options_t *options); +int using_default_dir_authorities(const or_options_t *options); int check_or_create_data_subdir(const char *subdir); int write_to_data_subdir(const char* subdir, const char* fname, @@ -149,14 +149,6 @@ smartlist_t *get_options_from_transport_options_line(const char *line, const char *transport); smartlist_t *get_options_for_server_transport(const char *transport); -/* Check if we are using default authorities */ -inline int -is_default_dir_authorities(const or_options_t *options) -{ - return (!options->DirAuthorities && - !options->AlternateDirAuthority) ? 1 : 0; -} - #ifdef CONFIG_PRIVATE #define CL_PORT_NO_STREAM_OPTIONS (1u<<0) |