diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/log.c | 4 | ||||
| -rw-r--r-- | src/or/circuitbuild.c | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/common/log.c b/src/common/log.c index 7e351aed2a..af5d183ea1 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -89,7 +89,11 @@ static void log_tor_version(logfile_t *lf, int reset) if (lf->is_temporary) /* If it's temporary, it isn't really a file. */ return; +#if HAVE_FTELLO + is_new = (ftello(lf->file) == 0); +#else is_new = (ftell(lf->file) == 0); +#endif if (reset && !is_new) /* We are resetting, but we aren't at the start of the file; no * need to log again. */ diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 63801982ae..6ec3023567 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -20,12 +20,10 @@ extern circuit_t *global_circuitlist; static int circuit_deliver_create_cell(circuit_t *circ, char *payload); -static cpath_build_state_t * -onion_new_cpath_build_state(uint8_t purpose, const char *exit_digest); -static int -onion_extend_cpath(crypt_path_t **head_ptr, cpath_build_state_t - *state, routerinfo_t **router_out); -static int decide_circ_id_type(char *local_nick, char *remote_nick); +static cpath_build_state_t *onion_new_cpath_build_state(uint8_t purpose, + const char *exit_digest); +static int onion_extend_cpath(crypt_path_t **head_ptr, + cpath_build_state_t *state, routerinfo_t **router_out); static int count_acceptable_routers(smartlist_t *routers); /** Iterate over values of circ_id, starting from conn-\>next_circ_id, @@ -342,7 +340,6 @@ void circuit_n_conn_done(connection_t *or_conn, int success) { static int circuit_deliver_create_cell(circuit_t *circ, char *payload) { - int circ_id_type; cell_t cell; tor_assert(circ); |