[or-cvs] Fix wide lines

[nickm@xxxxxxxx (Nick Mathewson)]

Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv18044/src/or

Modified Files:
	circuitbuild.c main.c rephist.c 
Log Message:
Fix wide lines

Index: circuitbuild.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/circuitbuild.c,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -p -d -r1.207 -r1.208
--- circuitbuild.c	11 Jan 2006 03:58:59 -0000	1.207
+++ circuitbuild.c	11 Jan 2006 04:04:42 -0000	1.208
@@ -2191,7 +2191,8 @@ entry_guards_parse_state(or_state_t *sta
     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);

Index: main.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/main.c,v
retrieving revision 1.612
retrieving revision 1.613
diff -u -p -d -r1.612 -r1.613
--- main.c	10 Jan 2006 22:42:44 -0000	1.612
+++ main.c	11 Jan 2006 04:04:42 -0000	1.613
@@ -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,

Index: rephist.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/rephist.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -d -r1.79 -r1.80
--- rephist.c	11 Jan 2006 03:57:01 -0000	1.79
+++ rephist.c	11 Jan 2006 04:04:42 -0000	1.80
@@ -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. */