[or-cvs] Funny. I could have sworn it compiled this morning when I c...

Nick Mathewson nickm at seul.org
Wed Oct 12 17:16:27 UTC 2005


Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv13638/src/or

Modified Files:
	config.c routerlist.c 
Log Message:
Funny. I could have sworn it compiled this morning when I checked it in.

Index: config.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/config.c,v
retrieving revision 1.433
retrieving revision 1.434
diff -u -d -r1.433 -r1.434
--- config.c	12 Oct 2005 13:49:13 -0000	1.433
+++ config.c	12 Oct 2005 17:16:25 -0000	1.434
@@ -2807,13 +2807,13 @@
 {
   int r;
   while (a && b) {
-    if (r=((int)a->addr - (int)b->addr))
+    if ((r=((int)a->addr - (int)b->addr)))
       return r;
-    if (r=((int)a->msk - (int)b->msk))
+    if ((r=((int)a->msk - (int)b->msk)))
       return r;
-    if (r=((int)a->prt_min - (int)b->prt_min))
+    if ((r=((int)a->prt_min - (int)b->prt_min)))
       return r;
-    if (r=((int)a->prt_max - (int)b->prt_max))
+    if ((r=((int)a->prt_max - (int)b->prt_max)))
       return r;
     a = a->next;
     b = b->next;

Index: routerlist.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/routerlist.c,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -d -r1.337 -r1.338
--- routerlist.c	12 Oct 2005 13:49:13 -0000	1.337
+++ routerlist.c	12 Oct 2005 17:16:25 -0000	1.338
@@ -2874,8 +2874,8 @@
       strcasecmp(r1->nickname, r2->nickname) ||
       r1->or_port != r2->or_port ||
       r1->dir_port != r2->dir_port ||
-      crypto_pk_cmp_keys(r1->onion_key, r2->onion_key) ||
-      crypto_pk_cmp_keys(r1->identity_pkey, r2->onion_pkey) ||
+      crypto_pk_cmp_keys(r1->onion_pkey, r2->onion_pkey) ||
+      crypto_pk_cmp_keys(r1->identity_pkey, r2->identity_pkey) ||
       strcasecmp(r1->platform, r2->platform) ||
       strcasecmp(r1->contact_info, r2->contact_info) ||
       r1->is_hibernating != r2->is_hibernating ||



More information about the tor-commits mailing list