summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-07-15 17:54:49 -0400
committerNick Mathewson <nickm@torproject.org>2011-07-15 17:54:49 -0400
commit8157dcbdf87271feab1b610df4eb0c616b250197 (patch)
treec8cee7119145b337b4a09cc521e2731d8e8a72bd
parent2b660f9781440e89a5b815c00ab9cbc13cff0cbd (diff)
parent2d0b56a5050380f541a9ddd3143dd95300c3f065 (diff)
downloadtor-8157dcbdf87271feab1b610df4eb0c616b250197.tar.gz
tor-8157dcbdf87271feab1b610df4eb0c616b250197.zip
Merge remote-tracking branch 'sebastian/compile_warning'
-rw-r--r--src/or/connection_or.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 2871f1f36a..e66d36a2f3 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -262,7 +262,8 @@ connection_or_report_broken_states(int severity, int domain)
items = smartlist_create();
STRMAP_FOREACH(broken_connection_counts, state, void *, countptr) {
broken_state_count_t *c = tor_malloc(sizeof(broken_state_count_t));
- total += c->count = (intptr_t)countptr;
+ c->count = (intptr_t)countptr;
+ total += (int)c->count;
c->state = state;
smartlist_add(items, c);
} STRMAP_FOREACH_END;