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.

diff --git a/changes/bug1384 b/changes/bug1384
index d3da65d45c15bfdb528935dd76422540a426427e..9c406d9e25aefef5aec90fb18c203e3fa71e3981 100644 (file)
--- 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 34bad4c6b2e9ab1a14208195f530b6be07a49e15..0a26c84be7d0b27600fe29db6af51b8f4dd6dcdb 100644 (file)
--- 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);