diff --git a/src/or/buffers.c b/src/or/buffers.c index 88f696f10b..eca603c263 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -280,16 +280,6 @@ buf_shrink_freelists(void) tor_free(mem); --list->len; } -#if 0 - /* XXXX020 Put this code back if the above gives us nasty segfaults. */ - for (i = list->slack; i < list->lowwater; ++i) { - char *mem = list->list; - tor_assert(mem); - list->list = *(char**)mem; - tor_free(mem); - --list->len; - } -#endif } list->lowwater = list->len; } diff --git a/src/or/connection.c b/src/or/connection.c index 588510a350..efd4c4a8a8 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2764,15 +2764,6 @@ assert_connection_ok(connection_t *conn, time_t now) assert_buf_ok(conn->outbuf); } - /* XXXX Fix this; no longer so.*/ -#if 0 - if (conn->type != CONN_TYPE_OR && conn->type != CONN_TYPE_DIR) - tor_assert(!conn->pkey); - /* pkey is set if we're a dir client, or if we're an OR in state OPEN - * connected to another OR. - */ -#endif - if (conn->chosen_exit_optional) { tor_assert(conn->type == CONN_TYPE_AP); tor_assert((TO_EDGE_CONN(conn))->chosen_exit_name); diff --git a/src/or/main.c b/src/or/main.c index 9f88f66c4a..3608b1791b 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1282,21 +1282,6 @@ do_hup(void) * configuration options. */ cpuworkers_rotate(); dns_reset(); -#if 0 - const char *descriptor; - char keydir[512]; - /* Write out a fresh descriptor, but leave old one on failure. */ - router_rebuild_descriptor(1); - descriptor = router_get_my_descriptor(); - if (descriptor) { - tor_snprintf(keydir,sizeof(keydir),"%s"PATH_SEPARATOR"router.desc", - options->DataDirectory); - log_info(LD_OR,"Saving descriptor to \"%s\"...",keydir); - if (write_str_to_file(keydir, descriptor, 0)) { - return 0; - } - } -#endif } return 0; } diff --git a/src/or/routerlist.c b/src/or/routerlist.c index b460e6a2ae..75b23ece74 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1703,10 +1703,6 @@ signed_descriptor_get_body(signed_descriptor_t *desc) desc, tor_strndup(r, 64)); } tor_assert(!memcmp("router ", r, 7) || !memcmp("extra-info ", r, 11)); -#if 0 - tor_assert(!memcmp("\n-----END SIGNATURE-----\n", - r + len - 25, 25)); -#endif return r; }