summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-09-14 02:18:28 +0000
committerRoger Dingledine <arma@torproject.org>2005-09-14 02:18:28 +0000
commit10893e7254ea873bfe434d554fe5eec348bb399a (patch)
tree4726dc81f3997fae7dd52618f3aa071d9aa2b2dd
parentc78aafe4b5bcdd0cd5e151d91c9c555139a35495 (diff)
downloadtor-10893e7254ea873bfe434d554fe5eec348bb399a.tar.gz
tor-10893e7254ea873bfe434d554fe5eec348bb399a.zip
simplify
svn:r5043
-rw-r--r--src/or/config.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 7e6aaf8cbe..f29c4ca0bc 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -873,7 +873,7 @@ config_assign_value(config_format_t *fmt, or_options_t *options,
*/
static int
config_assign_line(config_format_t *fmt, or_options_t *options,
- config_line_t *c, int use_defaults, int clear_first)
+ config_line_t *c, int use_defaults)
{
config_var_t *var;
@@ -1077,7 +1077,7 @@ There are three call cases for config_assign() currently.
Case one: Torrc entry
options_init_from_torrc() calls config_assign(0, 0)
- calls config_assign_line(0, 0).
+ calls config_assign_line(0).
if value is empty, calls option_reset(0) and returns.
calls config_assign_value(), appends.
@@ -1086,7 +1086,7 @@ options_trial_assign() calls config_assign(0, 1)
calls config_reset_line(0)
calls option_reset(0)
calls option_clear().
- calls config_assign_line(0, 1).
+ calls config_assign_line(0).
if value is empty, calls option_reset(0) and returns.
calls config_assign_value(), appends.
@@ -1096,7 +1096,7 @@ options_trial_assign() calls config_assign(1, 1)
calls option_reset(1)
calls option_clear().
calls config_assign_value(default)
- calls config_assign_line(1, 1).
+ calls config_assign_line(1).
calls option_reset(1) and returns.
*/
static int
@@ -1126,7 +1126,7 @@ config_assign(config_format_t *fmt, void *options,
/* pass 3: assign. */
while (list) {
int r;
- if ((r=config_assign_line(fmt, options, list, use_defaults, clear_first)))
+ if ((r=config_assign_line(fmt, options, list, use_defaults)))
return r;
list = list->next;
}