crank the max line limit down to 150 chars.

svn:r5550

8 files changed, 31 insertions, 12 deletions

diff --git a/contrib/checkSpace.pl b/contrib/checkSpace.pl
index 4b480e0f44..228d48b37b 100755
--- a/contrib/checkSpace.pl
+++ b/contrib/checkSpace.pl
@@ -37,7 +37,7 @@ for $fn (@ARGV) {
         }
 	## Terminals are still 80 columns wide in my world.  I refuse to
 	## accept double-line lines.
-	if (/^.{160}/) {
+	if (/^.{150}/) {
 	    print "     Wide:$fn:$.\n";
 	}
 
diff --git a/src/common/compat.c b/src/common/compat.c
index 703011f6cf..64b975e47c 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -463,7 +463,8 @@ set_max_file_descriptors(unsigned long limit, unsigned long cap)
     return -1;
   }
   if (rlim.rlim_max < limit) {
-    warn(LD_CONFIG,"We need %lu file descriptors available, and we're limited to %lu. Please change your ulimit -n.", limit, (unsigned long)rlim.rlim_max);
+    warn(LD_CONFIG,"We need %lu file descriptors available, and we're limited to %lu. Please change your ulimit -n.",
+         limit, (unsigned long)rlim.rlim_max);
     return -1;
   }
   most = (rlim.rlim_max > cap) ? cap : (unsigned) rlim.rlim_max;
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index a7c8ca8788..bdfb984d5b 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -485,7 +485,9 @@ inform_testing_reachability(void)
   if (me->dir_port)
     tor_snprintf(dirbuf, sizeof(dirbuf), " and DirPort %s:%d",
                  me->address, me->dir_port);
-  log(LOG_NOTICE, LD_OR, "Now checking whether ORPort %s:%d%s %s reachable... (this may take up to %d minutes -- look for log messages indicating success)",
+  log(LOG_NOTICE, LD_OR, "Now checking whether ORPort %s:%d%s %s reachable... "
+                         "(this may take up to %d minutes -- look for log "
+                         "messages indicating success)",
       me->address, me->or_port,
       me->dir_port ? dirbuf : "",
       me->dir_port ? "are" : "is",
diff --git a/src/or/config.c b/src/or/config.c
index 0f2c0afdc8..5fb06a6182 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1987,7 +1987,8 @@ options_validate(or_options_t *old_options, or_options_t *options)
       options->DirFetchPeriod = MAX_CACHE_DIR_FETCH_PERIOD;
     }
     if (options->StatusFetchPeriod > MAX_CACHE_STATUS_FETCH_PERIOD) {
-      log(LOG_WARN, LD_CONFIG, "Caching directory servers must have StatusFetchPeriod less than %d seconds. Clipping.", MAX_CACHE_STATUS_FETCH_PERIOD);
+      log(LOG_WARN, LD_CONFIG, "Caching directory servers must have StatusFetchPeriod less than %d seconds. Clipping.",
+          MAX_CACHE_STATUS_FETCH_PERIOD);
       options->StatusFetchPeriod = MAX_CACHE_STATUS_FETCH_PERIOD;
     }
   }
@@ -2169,7 +2170,8 @@ options_transition_allowed(or_options_t *old, or_options_t *new_val)
   }
 
   if (strcmp(old->DataDirectory,new_val->DataDirectory)!=0) {
-    warn(LD_CONFIG,"While Tor is running, changing DataDirectory (\"%s\"->\"%s\") is not allowed. Failing.", old->DataDirectory, new_val->DataDirectory);
+    warn(LD_CONFIG,"While Tor is running, changing DataDirectory (\"%s\"->\"%s\") is not allowed. Failing.",
+         old->DataDirectory, new_val->DataDirectory);
     return -1;
   }
 
@@ -3345,7 +3347,9 @@ init_libevent(void)
                          get_options()->ORPort != 0);
 #else
   log(LOG_NOTICE, LD_GENERAL, "Initialized old libevent (version 1.0b or earlier).");
-  log(LOG_WARN, LD_GENERAL, "You have a very old version of libevent.  It is likely to be buggy; please consider building Tor with a more recent version.");
+  log(LOG_WARN, LD_GENERAL,
+      "You have a very old version of libevent.  It is likely to be buggy; "
+      "please consider building Tor with a more recent version.");
 #endif
 
   return 0;
diff --git a/src/or/directory.c b/src/or/directory.c
index b3f8bbe2e3..fe100c9397 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1108,10 +1108,12 @@ connection_dir_client_reached_eof(connection_t *conn)
         info(LD_REND,"Uploading rendezvous descriptor: finished with status 200 (\"%s\")", reason);
         break;
       case 400:
-        warn(LD_REND,"http status 400 (\"%s\") response from dirserver '%s:%d'. Malformed rendezvous descriptor?", reason, conn->address, conn->port);
+        warn(LD_REND,"http status 400 (\"%s\") response from dirserver '%s:%d'. Malformed rendezvous descriptor?",
+             reason, conn->address, conn->port);
         break;
       default:
-        warn(LD_REND,"http status %d (\"%s\") response unexpected (server '%s:%d').", status_code, reason, conn->address, conn->port);
+        warn(LD_REND,"http status %d (\"%s\") response unexpected (server '%s:%d').",
+             status_code, reason, conn->address, conn->port);
         break;
     }
   }
@@ -1130,7 +1132,9 @@ connection_dir_reached_eof(connection_t *conn)
      * parsing partial serverdesc responses. */
     if (conn->purpose == DIR_PURPOSE_FETCH_SERVERDESC &&
         buf_datalen(conn->inbuf)>=(24*1024)) {
-      notice(LD_DIR, "Directory connection closed early after downloading %d bytes of descriptors.  If this happens often, please file a bug report.",
+      notice(LD_DIR,
+             "Directory connection closed early after downloading %d bytes "
+             "of descriptors. If this happens often, please file a bug report.",
              (int)buf_datalen(conn->inbuf));
     }
     connection_close_immediate(conn); /* it was an error; give up on flushing */
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 7b52b6e62e..606c2385bb 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -437,7 +437,9 @@ authdir_wants_to_reject_router(routerinfo_t *ri,
     return -1;
   }
   if (ri->cache_info.published_on < now-ROUTER_MAX_AGE) {
-    notice(LD_DIRSERV, "Publication time for router with nickname '%s' is too far (%d minutes) in the past. Not adding (ContactInfo '%s', platform '%s').",
+    notice(LD_DIRSERV,
+           "Publication time for router with nickname '%s' is too far "
+           "(%d minutes) in the past. Not adding (ContactInfo '%s', platform '%s').",
            ri->nickname, (int)((now-ri->cache_info.published_on)/60),
            ri->contact_info ? ri->contact_info : "",
            ri->platform ? ri->platform : "");
diff --git a/src/or/relay.c b/src/or/relay.c
index ae1dafa44e..6f65215578 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -663,7 +663,10 @@ connection_edge_process_end_not_open(
             (rh->length < 5 ||
              (tor_inet_aton(conn->socks_request->address, &in) &&
               !conn->chosen_exit_name))) {
-          notice(LD_APP,"Exitrouter '%s' seems to be more restrictive than its exit policy. Not using this router as exit for now.", exitrouter->nickname);
+          notice(LD_APP,
+                 "Exitrouter '%s' seems to be more restrictive than its exit "
+                 "policy. Not using this router as exit for now.",
+                 exitrouter->nickname);
           addr_policy_free(exitrouter->exit_policy);
           exitrouter->exit_policy =
             router_parse_addr_policy_from_string("reject *:*", -1);
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 3b4bf6b66c..e6fdda0cfe 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1812,7 +1812,10 @@ router_load_routers_from_string(const char *s, int from_cache,
       } else {
         char *requested =
           smartlist_join_strings(requested_fingerprints," ",0,NULL);
-        warn(LD_DIR, "We received a router descriptor with a fingerprint (%s) that we never requested. (We asked for: %s.) Dropping.", fp, requested);
+        warn(LD_DIR,
+             "We received a router descriptor with a fingerprint (%s) "
+             "that we never requested. (We asked for: %s.) Dropping.",
+             fp, requested);
         tor_free(requested);
         routerinfo_free(ri);
         continue;