[or-cvs] r17198: {tor} fix wide lines (tor/trunk/src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2008-11-06 20:48:55 -0500 (Thu, 06 Nov 2008)
New Revision: 17198

Modified:
   tor/trunk/src/or/circuituse.c
   tor/trunk/src/or/dirserv.c
   tor/trunk/src/or/dnsserv.c
   tor/trunk/src/or/or.h
Log:
fix wide lines

Modified: tor/trunk/src/or/circuituse.c
===================================================================
--- tor/trunk/src/or/circuituse.c	2008-11-06 18:26:56 UTC (rev 17197)
+++ tor/trunk/src/or/circuituse.c	2008-11-07 01:48:55 UTC (rev 17198)
@@ -1074,10 +1074,11 @@
       uint32_t addr = 0;
       if (tor_inet_aton(conn->socks_request->address, &in))
         addr = ntohl(in.s_addr);
-      if (router_exit_policy_all_routers_reject(addr, conn->socks_request->port,
+      if (router_exit_policy_all_routers_reject(addr,
+                                                conn->socks_request->port,
                                                 need_uptime)) {
         log_notice(LD_APP,
-                   "No Tor server exists that allows exit to %s:%d. Rejecting.",
+                   "No Tor server allows exit to %s:%d. Rejecting.",
                    safe_str(conn->socks_request->address),
                    conn->socks_request->port);
         return -1;

Modified: tor/trunk/src/or/dirserv.c
===================================================================
--- tor/trunk/src/or/dirserv.c	2008-11-06 18:26:56 UTC (rev 17197)
+++ tor/trunk/src/or/dirserv.c	2008-11-07 01:48:55 UTC (rev 17198)
@@ -1814,7 +1814,7 @@
       "Cutoffs: For Stable, %lu sec uptime, %lu sec MTBF. "
       "For Fast: %lu bytes/sec. "
       "For Guard: WFU %.03lf%%, time-known %lu sec, "
-      "and bandwidth %lu or %lu bytes/sec. We do%s have enough stability data.",
+      "and bandwidth %lu or %lu bytes/sec. We%s have enough stability data.",
       (unsigned long)stable_uptime,
       (unsigned long)stable_mtbf,
       (unsigned long)fast_bandwidth,
@@ -1822,7 +1822,7 @@
       (unsigned long)guard_tk,
       (unsigned long)guard_bandwidth_including_exits,
       (unsigned long)guard_bandwidth_excluding_exits,
-      enough_mtbf_info ? "" : "not ");
+      enough_mtbf_info ? "" : "don't ");
 
   tor_free(uptimes);
   tor_free(mtbfs);

Modified: tor/trunk/src/or/dnsserv.c
===================================================================
--- tor/trunk/src/or/dnsserv.c	2008-11-06 18:26:56 UTC (rev 17197)
+++ tor/trunk/src/or/dnsserv.c	2008-11-07 01:48:55 UTC (rev 17198)
@@ -255,7 +255,8 @@
   int err = DNS_ERR_NONE;
   if (!req)
     return;
-  name = evdns_get_orig_address(req, answer_type, conn->socks_request->address);
+  name = evdns_get_orig_address(req, answer_type,
+                                conn->socks_request->address);
 
   /* XXXX021 Re-do; this is dumb. */
   if (ttl < 60)

Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2008-11-06 18:26:56 UTC (rev 17197)
+++ tor/trunk/src/or/or.h	2008-11-07 01:48:55 UTC (rev 17198)
@@ -4223,10 +4223,12 @@
   CRN_NEED_CAPACITY = 1<<1,
   CRN_NEED_GUARD = 1<<2,
   CRN_ALLOW_INVALID = 1<<3,
+#if 0
   /* XXXX021 not used, apparently. */
   CRN_STRICT_PREFERRED = 1<<4,
   /* XXXX021 not used, apparently. */
   CRN_WEIGHT_AS_EXIT = 1<<5
+#endif
 } router_crn_flags_t;
 
 routerinfo_t *router_choose_random_node(const char *preferred,