[tor-commits] [tor/master] Fix indentation when using the ternary operator in handle_get_status_vote().

[nickm@xxxxxxxxxxxxxx]

commit 59d17ca2bb6ab243bd58b29d26ccf6dd10741abe
Author: Alexander Færøy <ahf@xxxxxxxxxxxxxx>
Date:   Fri May 12 13:17:43 2017 +0200

    Fix indentation when using the ternary operator in handle_get_status_vote().
    
    See: https://bugs.torproject.org/21667
---
 src/or/directory.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/or/directory.c b/src/or/directory.c
index ed4f961..7965ffd 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -3926,9 +3926,8 @@ handle_get_status_vote(dir_connection_t *conn, const get_handler_args_t *args)
       goto vote_done;
     }
     SMARTLIST_FOREACH(dir_items, cached_dir_t *, d,
-                      body_len += compress_method != NO_METHOD
-                      ? d->dir_compressed_len
-                      : d->dir_len);
+                      body_len += compress_method != NO_METHOD ?
+                        d->dir_compressed_len : d->dir_len);
     estimated_len += body_len;
     SMARTLIST_FOREACH(items, const char *, item, {
         size_t ln = strlen(item);
@@ -3960,10 +3959,10 @@ handle_get_status_vote(dir_connection_t *conn, const get_handler_args_t *args)
       }
     } else {
       SMARTLIST_FOREACH(dir_items, cached_dir_t *, d,
-          connection_write_to_buf(compress_method != NO_METHOD
-                                  ? d->dir_compressed : d->dir,
-                                  compress_method != NO_METHOD
-                                  ? d->dir_compressed_len : d->dir_len,
+          connection_write_to_buf(compress_method != NO_METHOD ?
+                                    d->dir_compressed : d->dir,
+                                  compress_method != NO_METHOD ?
+                                    d->dir_compressed_len : d->dir_len,
                                   TO_CONN(conn)));
     }
   vote_done:



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