From 8907391ad60629870a2602adc5a3d171f70f789b Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 11 Jan 2006 04:04:42 +0000 Subject: Fix wide lines svn:r5793 --- src/or/circuitbuild.c | 3 ++- src/or/main.c | 4 ++-- src/or/rephist.c | 7 ++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index c8896bc25..2195810b2 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2191,7 +2191,8 @@ entry_guards_parse_state(or_state_t *state, int set, const char **err) if (!strcasecmp(line->key, "EntryGuard")) { smartlist_t *args = smartlist_create(); node = tor_malloc_zero(sizeof(entry_guard_t)); - node->made_contact = 1; /* all entry guards on disk have been contacted */ + /* all entry guards on disk have been contacted */ + node->made_contact = 1; smartlist_add(new_entry_guards, node); smartlist_split_string(args, line->value, " ", SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); diff --git a/src/or/main.c b/src/or/main.c index f9d3421f3..a49ad5d2d 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -487,8 +487,8 @@ conn_close_if_marked(int i) else severity = LOG_NOTICE; log_fn(severity, LD_NET, "Something wrong with your network connection? " - "We tried to write %d bytes to addr %s (fd %d, type %s, state %d) " - "but timed out. (Marked at %s:%d)", + "We tried to write %d bytes to addr %s (fd %d, type %s, state %d)" + " but timed out. (Marked at %s:%d)", (int)buf_datalen(conn->outbuf), safe_str(conn->address), conn->s, conn_type_to_string(conn->type), conn->state, diff --git a/src/or/rephist.c b/src/or/rephist.c index fb6ac405b..4540cfeca 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -397,9 +397,10 @@ typedef struct bw_array_t { uint64_t obs[NUM_SECS_ROLLING_MEASURE]; int cur_obs_idx; /**< Current position in obs. */ time_t cur_obs_time; /**< Time represented in obs[cur_obs_idx] */ - uint64_t total_obs; /**< Total for all members of obs except obs[cur_obs_idx] */ - uint64_t max_total; /**< Largest value that total_obs has taken on in the current - * period. */ + uint64_t total_obs; /**< Total for all members of obs except + * obs[cur_obs_idx] */ + uint64_t max_total; /**< Largest value that total_obs has taken on in the + * current period. */ uint64_t total_in_period; /**< Total bytes transferred in the current * period. */ -- cgit v1.2.3