[tor-commits] [tor/master] remove some dead code, found by coverity

nickm at torproject.org nickm at torproject.org
Tue Jun 14 16:28:18 UTC 2011


commit db7dd3ee7a07d9bc121d1c8f353e206327bb72c5
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Wed Jun 8 20:02:16 2011 +0200

    remove some dead code, found by coverity
---
 changes/coverity_maint |    3 +++
 src/or/rephist.c       |    3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/changes/coverity_maint b/changes/coverity_maint
new file mode 100644
index 0000000..ec25d09
--- /dev/null
+++ b/changes/coverity_maint
@@ -0,0 +1,3 @@
+  o Code simplifications and refactoring:
+    - Remove some dead code as indicated by coverity.
+
diff --git a/src/or/rephist.c b/src/or/rephist.c
index 6be8484..242fe81 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -2401,8 +2401,7 @@ rep_hist_buffer_stats_add_circ(circuit_t *circ, time_t end_of_interval)
   stat = tor_malloc_zero(sizeof(circ_buffer_stats_t));
   stat->processed_cells = orcirc->processed_cells;
   /* 1000.0 for s -> ms; 2.0 because of app-ward and exit-ward queues */
-  stat->mean_num_cells_in_queue = interval_length == 0 ? 0.0 :
-      (double) orcirc->total_cell_waiting_time /
+  stat->mean_num_cells_in_queue = (double) orcirc->total_cell_waiting_time /
       (double) interval_length / 1000.0 / 2.0;
   stat->mean_time_cells_in_queue =
       (double) orcirc->total_cell_waiting_time /





More information about the tor-commits mailing list