[tor-commits] [tor/release-0.2.2] Fixup whitespace issues from 3122 commit

[nickm@xxxxxxxxxxxxxx]

commit bc44393eb59a1d303314b4b646b4d815f4eadc22
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Sun May 15 20:12:01 2011 -0400

    Fixup whitespace issues from 3122 commit
---
 src/or/config.c  |    7 ++++---
 src/or/dirvote.c |    3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 9c68b6f..0997fe2 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1288,9 +1288,10 @@ options_act(or_options_t *old_options)
     if (revise_trackexithosts)
       addressmap_clear_excluded_trackexithosts(options);
 
-    if (old_options->AutomapHostsOnResolve && !options->AutomapHostsOnResolve) {
-      revise_automap_entries = 1;
-    } else if (options->AutomapHostsOnResolve) {
+    if (!options->AutomapHostsOnResolve) {
+      if (old_options->AutomapHostsOnResolve)
+        revise_automap_entries = 1;
+    } else {
       if (!smartlist_strings_eq(old_options->AutomapHostsSuffixes,
                                 options->AutomapHostsSuffixes))
         revise_automap_entries = 1;
diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 517dac5..96e3df5 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -2213,7 +2213,8 @@ networkstatus_add_detached_signatures(networkstatus_t *target,
     }
     for (alg = DIGEST_SHA1; alg < N_DIGEST_ALGORITHMS; ++alg) {
       if (!tor_mem_is_zero(digests->d[alg], DIGEST256_LEN)) {
-        if (fast_memeq(target->digests.d[alg], digests->d[alg], DIGEST256_LEN)) {
+        if (fast_memeq(target->digests.d[alg], digests->d[alg],
+                       DIGEST256_LEN)) {
           ++n_matches;
         } else {
           *msg_out = "Mismatched digest.";



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits