[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] Possible fix for c99 aliasing warnings



Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/tmp/cvs-serv15987/src/or

Modified Files:
	rephist.c 
Log Message:
Possible fix for c99 aliasing warnings

Index: rephist.c
===================================================================
RCS file: /home/or/cvsroot/src/or/rephist.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rephist.c	20 Mar 2004 20:37:49 -0000	1.3
+++ rephist.c	29 Mar 2004 06:18:04 -0000	1.4
@@ -181,6 +181,7 @@
   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 @@
 
   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 @@
     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);