[tor-commits] [tor/master] Fix compilation: get_options() now returns const

nickm at torproject.org nickm at torproject.org
Wed Nov 30 19:10:01 UTC 2011


commit 54d262a728d97a26d1e019a8cd94a679a5741e31
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 8 09:30:21 2011 -0400

    Fix compilation: get_options() now returns const
---
 src/test/test_config.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/test_config.c b/src/test/test_config.c
index 8880bd0..fd38e2f 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -35,7 +35,7 @@ test_config_addressmap(void)
           "MapAddress 6.6.6.6 www.infiniteloop.org\n"
           , sizeof(buf));
 
-  config_get_lines(buf, &(get_options()->AddressMap));
+  config_get_lines(buf, &(get_options_mutable()->AddressMap));
   config_register_addressmaps(get_options());
 
   /* MapAddress .invalidwildcard.com .torserver.exit  - no match */
@@ -116,7 +116,7 @@ test_config_addressmap(void)
           "MapAddress *.torproject.org 1.1.1.1\n"
           "MapAddress *.net 2.2.2.2\n"
           , sizeof(buf));
-  config_get_lines(buf, &(get_options()->AddressMap));
+  config_get_lines(buf, &(get_options_mutable()->AddressMap));
   config_register_addressmaps(get_options());
 
   strlcpy(address, "www.abc.com", sizeof(address));
@@ -142,7 +142,7 @@ test_config_addressmap(void)
   /* We don't support '*' as a mapping directive */
   addressmap_clear_configured();
   strlcpy(buf, "MapAddress * *.torserver.exit\n", sizeof(buf));
-  config_get_lines(buf, &(get_options()->AddressMap));
+  config_get_lines(buf, &(get_options_mutable()->AddressMap));
   config_register_addressmaps(get_options());
 
   strlcpy(address, "www.abc.com", sizeof(address));





More information about the tor-commits mailing list