summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2004-03-29 06:18:04 +0000
committerNick Mathewson <nickm@torproject.org>2004-03-29 06:18:04 +0000
commit47b9d4439a77c4a8f90e7b3c566f0e10d228d854 (patch)
tree80a16f44b3c6a6c336c03b80c6f4a2a204fae7cf
parent8c3999c9648f0d28ec16f1de7a0190d7b2730e7f (diff)
downloadtor-47b9d4439a77c4a8f90e7b3c566f0e10d228d854.tar.gz
tor-47b9d4439a77c4a8f90e7b3c566f0e10d228d854.zip
Possible fix for c99 aliasing warnings
svn:r1360
-rw-r--r--src/or/rephist.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/or/rephist.c b/src/or/rephist.c
index 998758164e..6150b68e57 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -181,6 +181,7 @@ void rep_hist_dump_stats(time_t now, int severity)
const char *name1, *name2;
or_history_t *or_history;
link_history_t *link_history;
+ void *or_history_p, *link_history_p;
double uptime;
char buffer[2048];
int len;
@@ -190,7 +191,8 @@ void rep_hist_dump_stats(time_t now, int severity)
for (orhist_it = strmap_iter_init(history_map); !strmap_iter_done(orhist_it);
orhist_it = strmap_iter_next(history_map,orhist_it)) {
- strmap_iter_get(orhist_it, &name1, (void**)&or_history);
+ strmap_iter_get(orhist_it, &name1, &or_history_p);
+ or_history = (or_history_t*) or_history_p;
update_or_history(or_history, now);
upt = or_history->uptime;
@@ -211,7 +213,8 @@ void rep_hist_dump_stats(time_t now, int severity)
for (lhist_it = strmap_iter_init(or_history->link_history_map);
!strmap_iter_done(lhist_it);
lhist_it = strmap_iter_next(or_history->link_history_map, lhist_it)) {
- strmap_iter_get(lhist_it, &name2, (void**)&link_history);
+ strmap_iter_get(lhist_it, &name2, &link_history_p);
+ link_history = (link_history_t*) link_history_p;
len += snprintf(buffer+len, 2048-len, "%s(%ld/%ld); ", name2,
link_history->n_extend_ok,
link_history->n_extend_ok+link_history->n_extend_fail);