r7303@Kushana: nickm | 2006-08-10 01:52:19 -0700

 whitespace fixes


svn:r7011

contrib/checkSpace.pl

@@ -91,7 +91,7 @@ for $fn (@ARGV) {
             ## 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";

src/or/config.c

@@ -3577,7 +3577,8 @@ init_libevent(void)
 #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 "

src/or/dns.c

@@ -272,8 +272,8 @@ purge_expired_resolves(uint32_t now)
 
     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) {