Commit 1866ad35 authored by Nick Mathewson's avatar Nick Mathewson 🦞
Browse files

r13274@catbus: nickm | 2007-06-05 19:06:30 -0400 

 Remove some deadcode that seems unlikely to return


svn:r10509
parent bafff636

src/or/buffers.c

+0 −10
Original line number Diff line number Diff line
@@ -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;

  }

src/or/connection.c

+0 −9
Original line number Diff line number Diff line
@@ -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);

src/or/main.c

+0 −15
Original line number Diff line number Diff line
@@ -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;

}

src/or/routerlist.c

+0 −4
Original line number Diff line number Diff line
@@ -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;

}