diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-07-02 23:12:32 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-07-02 23:12:32 -0400 |
| commit | c4b831e92d68e6c56246ae6e5b2002ef558525ac (patch) | |
| tree | d1149907147426527037f74f4a763e0cef27640a /src/or/config.c | |
| parent | 36468ec44b6dc3443b0142de83a100e2a853acf8 (diff) | |
| download | tor-c4b831e92d68e6c56246ae6e5b2002ef558525ac.tar.gz tor-c4b831e92d68e6c56246ae6e5b2002ef558525ac.zip | |
Small tweaks to 2841 code
- const-ify some transport_t pointers
- Remove a vestigial argument to parse_bridge_line
- Make it compile without warnings on my laptop with
--enable-gcc-warnings
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/or/config.c b/src/or/config.c index 12320e07f9..9096839c15 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -570,8 +570,7 @@ static int options_transition_affects_descriptor(or_options_t *old_options, static int check_nickname_list(const char *lst, const char *name, char **msg); static void config_register_addressmaps(or_options_t *options); -static int parse_bridge_line(const char *line, int validate_only, - or_options_t *options); +static int parse_bridge_line(const char *line, int validate_only); static int parse_client_transport_line(const char *line, int validate_only); static int parse_dir_server_line(const char *line, dirinfo_type_t required_type, @@ -1223,7 +1222,7 @@ options_act(or_options_t *old_options) if (options->Bridges) { mark_bridge_list(); for (cl = options->Bridges; cl; cl = cl->next) { - if (parse_bridge_line(cl->value, 0, options)<0) { + if (parse_bridge_line(cl->value, 0)<0) { log_warn(LD_BUG, "Previously validated Bridge line could not be added!"); return -1; @@ -3696,7 +3695,7 @@ options_validate(or_options_t *old_options, or_options_t *options, if (options->Bridges) { for (cl = options->Bridges; cl; cl = cl->next) { - if (parse_bridge_line(cl->value, 1, options)<0) + if (parse_bridge_line(cl->value, 1)<0) REJECT("Bridge line did not parse. See logs for details."); } } @@ -4579,8 +4578,7 @@ options_init_logs(or_options_t *options, int validate_only) * <b>validate_only</b> is 0, and the line is well-formed, then add * the bridge described in the line to our internal bridge list. */ static int -parse_bridge_line(const char *line, int validate_only, - or_options_t *options) +parse_bridge_line(const char *line, int validate_only) { smartlist_t *items = NULL; int r; |