Fix unit tests, make it compile

svn:r2543

diff --git a/src/or/connection.c b/src/or/connection.c
index 87cb3c10d959f8f110cce4fcef35597c19dc502c..08bae131f5a9abe2f9b9873a580b5b7b25c5041b 100644 (file)
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -329,7 +329,7 @@ static int connection_create_listener(const char *bindaddress, uint16_t bindport
   
   if (usePort==0)
     usePort = bindport;
-  binaddrr.sin_addr.s_addr = htonl(addr);
+  bindaddr.sin_addr.s_addr = htonl(addr);
   bindaddr.sin_family = AF_INET;
   bindaddr.sin_port = htons((uint16_t) usePort);
 

diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 4469656b1a33a2acb041536aff65949e6be22a06..6a759fdd1f63a6ae8aeeb9ed416993291657eb47 100644 (file)
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -388,10 +388,10 @@ router_parse_routerlist_from_directory(const char *str,
     goto err;
   }
   if (tok->n_args > 1) {
-    log_fn(LOG_WARN, "Invalid recommended-software line", tok->n_args);goto err;
+    log_fn(LOG_WARN, "Invalid recommended-software line");goto err;
            
   }
-  versions = tor->n_args ? tor_strdup(tok->args[0]) : tor_strdup("");
+  versions = tok->n_args ? tor_strdup(tok->args[0]) : tor_strdup("");
 
   if (!(tok = find_first_by_keyword(tokens, K_RUNNING_ROUTERS))) {
     log_fn(LOG_WARN, "Missing running-routers line from directory.");

diff --git a/src/or/test.c b/src/or/test.c
index a7b1e51eaeef2c726f4db9262cef55ac30c52373..f317d674cd27aa4732899177fd08ff05585e9591 100644 (file)
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -661,12 +661,12 @@ test_util() {
   cp = NULL; u32 = 3; u16 = 3;
   test_assert(!parse_addr_port("1.2.3.4", &cp, &u32, &u16));
   test_streq(cp, "1.2.3.4");
-  test_eq(u32, htonl(0x01020304u));
+  test_eq(u32, 0x01020304u);
   test_eq(u16, 0);
   tor_free(cp);
   test_assert(!parse_addr_port("4.3.2.1:99", &cp, &u32, &u16));
   test_streq(cp, "4.3.2.1");
-  test_eq(u32, htonl(0x04030201u));
+  test_eq(u32, 0x04030201u);
   test_eq(u16, 99);
   tor_free(cp);
   test_assert(!parse_addr_port("nonexistent.address:4040", &cp, NULL, &u16));
@@ -675,13 +675,13 @@ test_util() {
   tor_free(cp);
   test_assert(!parse_addr_port("localhost:9999", &cp, &u32, &u16));
   test_streq(cp, "localhost");
-  test_eq(u32, htonl(0x7f000001u));
+  test_eq(u32, 0x7f000001u);
   test_eq(u16, 9999);
   tor_free(cp);
   u32 = 3;
   test_assert(!parse_addr_port("localhost", NULL, &u32, &u16));
   test_eq(cp, NULL);
-  test_eq(u32, htonl(0x7f000001u));
+  test_eq(u32, 0x7f000001u);
   test_eq(u16, 0);
   tor_free(cp);