diff options
| author | Roger Dingledine <arma@torproject.org> | 2005-09-14 02:07:35 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2005-09-14 02:07:35 +0000 |
| commit | 1f930a9a70ab5b93b5cb7a076743c6b8fc9cc4fb (patch) | |
| tree | 65cbad001195fc4311a55b428330c1783e07f191 /src/or/or.h | |
| parent | f08bccc46096e732a11dae94951d92f7cc8951bb (diff) | |
| download | tor-1f930a9a70ab5b93b5cb7a076743c6b8fc9cc4fb.tar tor-1f930a9a70ab5b93b5cb7a076743c6b8fc9cc4fb.tar.gz | |
checkpoint: clean up and document the three ways to call config_assign()
and reduce code duplication in config_free() and option_is_same().
svn:r5040
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h index b102e766b..441a556b1 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1444,7 +1444,7 @@ const char *safe_str(const char *address); int config_get_lines(char *string, config_line_t **result); void config_free_lines(config_line_t *front); -int options_trial_assign(config_line_t *list, int reset); +int options_trial_assign(config_line_t *list, int use_defaults, int clear_first); int resolve_my_address(or_options_t *options, uint32_t *addr, char **hostname_out); void options_init(or_options_t *options); |