diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2010-08-02 18:44:00 +0200 |
|---|---|---|
| committer | Sebastian Hahn <sebastian@torproject.org> | 2010-08-02 18:45:17 +0200 |
| commit | a9d055c5c516924b2e87e416b154bf220b0a914e (patch) | |
| tree | 2601ad1dc7ca2fe4cdbfd4901a6a27c1868497d8 | |
| parent | 883af78a9d536562345d2713edebb13f8978a72a (diff) | |
| download | tor-a9d055c5c516924b2e87e416b154bf220b0a914e.tar.gz tor-a9d055c5c516924b2e87e416b154bf220b0a914e.zip | |
Fix a compile warning on OS X 10.6
Also update the changes file to contain a note on which bug was
fixed by this.
| -rw-r--r-- | changes/bug1384 | 2 | ||||
| -rw-r--r-- | src/or/config.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/changes/bug1384 b/changes/bug1384 index d3da65d45c..9c406d9e25 100644 --- a/changes/bug1384 +++ b/changes/bug1384 @@ -1,5 +1,5 @@ o Minor features: - Warn when the same option is provided more then once in a torrc file, on the command line, or in a single SETCONF statement, and option - is one that only accepts a single value. + is one that only accepts a single value. Closes bug 1384. diff --git a/src/or/config.c b/src/or/config.c index 34bad4c6b2..0a26c84be7 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1761,7 +1761,7 @@ config_assign_line(config_format_t *fmt, or_options_t *options, var->type != CONFIG_TYPE_LINELIST_S)) { /* We're tracking which options we've seen, and this option is not * supposed to occur more than once. */ - int var_index = var - fmt->vars; + int var_index = (int)(var - fmt->vars); if (bitarray_is_set(options_seen, var_index)) { log_warn(LD_CONFIG, "Option '%s' used more than once; all but the last " "value will be ignored.", var->name); |