diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-07-18 10:14:14 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-07-18 10:14:14 -0400 |
| commit | b355ddb20f534d772dcb42737ceb1d0264e2c3f1 (patch) | |
| tree | 5bf4f320dff8263d2168454207aeb63f85ec962e /src/or/config.c | |
| parent | 4cac5df5548e0051a6927a778da3e6f01f45dc56 (diff) | |
| parent | 78dec943074c26747abc7a68cd6aec5269100569 (diff) | |
| download | tor-b355ddb20f534d772dcb42737ceb1d0264e2c3f1.tar.gz tor-b355ddb20f534d772dcb42737ceb1d0264e2c3f1.zip | |
Merge branch 'smartlist_shorten' into maint-0.2.3
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/config.c b/src/or/config.c index bacb06ee99..8703667945 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3288,7 +3288,7 @@ compute_publishserverdescriptor(or_options_t *options) *auth = NO_DIRINFO; if (!list) /* empty list, answer is none */ return 0; - SMARTLIST_FOREACH(list, const char *, string, { + SMARTLIST_FOREACH_BEGIN(list, const char *, string) { if (!strcasecmp(string, "v1")) *auth |= V1_DIRINFO; else if (!strcmp(string, "1")) @@ -3310,7 +3310,7 @@ compute_publishserverdescriptor(or_options_t *options) /* no authority */; else return -1; - }); + } SMARTLIST_FOREACH_END(string); return 0; } @@ -3646,7 +3646,7 @@ options_validate(or_options_t *old_options, or_options_t *options, options->_AllowInvalid = 0; if (options->AllowInvalidNodes) { - SMARTLIST_FOREACH(options->AllowInvalidNodes, const char *, cp, { + SMARTLIST_FOREACH_BEGIN(options->AllowInvalidNodes, const char *, cp) { if (!strcasecmp(cp, "entry")) options->_AllowInvalid |= ALLOW_INVALID_ENTRY; else if (!strcasecmp(cp, "exit")) @@ -3662,7 +3662,7 @@ options_validate(or_options_t *old_options, or_options_t *options, "Unrecognized value '%s' in AllowInvalidNodes", cp); return -1; } - }); + } SMARTLIST_FOREACH_END(cp); } if (!options->SafeLogging || |