[or-cvs] r7011: whitespace fixes (in tor/trunk: . contrib src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2006-08-10 05:02:12 -0400 (Thu, 10 Aug 2006)
New Revision: 7011

Modified:
   tor/trunk/
   tor/trunk/contrib/checkSpace.pl
   tor/trunk/src/or/config.c
   tor/trunk/src/or/connection_edge.c
   tor/trunk/src/or/control.c
   tor/trunk/src/or/dns.c
Log:
 r7303@Kushana:  nickm | 2006-08-10 01:52:19 -0700
 whitespace fixes



Property changes on: tor/trunk
___________________________________________________________________
Name: svk:merge
   - 17f730b7-d419-0410-b50f-85ee4b70197a:/local/or/tor/trunk:8245
1f724f9b-111a-0410-b636-93f1a77c1813:/local/or/tor/trunk:8207
96637b51-b116-0410-a10e-9941ebb49b64:/tor/branches/spec:7005
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/eventdns:7014
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/mmap:7030
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/oo-connections:6950
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/trans-ap:7302
   + 17f730b7-d419-0410-b50f-85ee4b70197a:/local/or/tor/trunk:8245
1f724f9b-111a-0410-b636-93f1a77c1813:/local/or/tor/trunk:8207
96637b51-b116-0410-a10e-9941ebb49b64:/tor/branches/spec:7005
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/eventdns:7014
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/mmap:7030
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/oo-connections:6950
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/trans-ap:7303

Modified: tor/trunk/contrib/checkSpace.pl
===================================================================
--- tor/trunk/contrib/checkSpace.pl	2006-08-10 09:02:02 UTC (rev 7010)
+++ tor/trunk/contrib/checkSpace.pl	2006-08-10 09:02:12 UTC (rev 7011)
@@ -91,7 +91,7 @@
             ## Warn about functions not declared at start of line.
             if ($in_func_head ||
                 ($fn !~ /\.h$/ && /^[a-zA-Z0-9_]/ &&
-                 ! /^(?:static )?(?:typedef|struct|union)[^\(]*$/ &&
+                 ! /^(?:const |static )*(?:typedef|struct|union)[^\(]*$/ &&
                  ! /= *\{$/ && ! /;$/)) {
                 if (/.\{$/){
                     print "fn() {:$fn:$.\n";

Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c	2006-08-10 09:02:02 UTC (rev 7010)
+++ tor/trunk/src/or/config.c	2006-08-10 09:02:12 UTC (rev 7011)
@@ -3577,7 +3577,8 @@
 #ifdef HAVE_EVENT_GET_VERSION
     ver = event_get_version();
 #endif
-    tor_assert(ver); /* If we're 1.1b or later, we'd better have get_version()*/
+    /* If we're 1.1b or later, we'd better have get_version() */
+    tor_assert(ver);
     log(LOG_NOTICE, LD_GENERAL, "Enabling experimental OS X kqueue support "
         "with libevent %s.  If this turns out to not work, "
         "set the environment variable EVENT_NOKQUEUE, and tell the Tor "

Modified: tor/trunk/src/or/connection_edge.c
===================================================================
--- tor/trunk/src/or/connection_edge.c	2006-08-10 09:02:02 UTC (rev 7010)
+++ tor/trunk/src/or/connection_edge.c	2006-08-10 09:02:12 UTC (rev 7011)
@@ -1314,7 +1314,7 @@
   pnl.sport           = htons(conn->_base.port);
   pnl.daddr.v4.s_addr = proxy_addr.sin_addr.s_addr;
   pnl.dport           = proxy_addr.sin_port;
-  
+
   pf = get_pf_socket();
   if (pf<0)
     return -1;

Modified: tor/trunk/src/or/control.c
===================================================================
--- tor/trunk/src/or/control.c	2006-08-10 09:02:02 UTC (rev 7010)
+++ tor/trunk/src/or/control.c	2006-08-10 09:02:12 UTC (rev 7011)
@@ -2721,7 +2721,7 @@
                         "650 STREAM %lu %s %lu %s\r\n",
                         (unsigned long)conn->global_identifier, status,
                         origin_circ?
-                            (unsigned long)origin_circ->global_identifier : 0ul,
+                           (unsigned long)origin_circ->global_identifier : 0ul,
                         buf);
     /* XXX need to specify its intended exit, etc? */
   }

Modified: tor/trunk/src/or/dns.c
===================================================================
--- tor/trunk/src/or/dns.c	2006-08-10 09:02:02 UTC (rev 7010)
+++ tor/trunk/src/or/dns.c	2006-08-10 09:02:12 UTC (rev 7011)
@@ -272,8 +272,8 @@
 
     if (resolve->state == CACHE_STATE_PENDING) {
       log_debug(LD_EXIT,
-                "Expiring a dns resolve %s that's still pending. Forgot to cull"
-                " it? DNS resolve didn't tell us about the timeout?",
+                "Expiring a dns resolve %s that's still pending. Forgot to "
+                "cull it? DNS resolve didn't tell us about the timeout?",
                 escaped_safe_str(resolve->address));
     } else if (resolve->state == CACHE_STATE_CACHED_VALID ||
                resolve->state == CACHE_STATE_CACHED_FAILED) {