[or-cvs] r6900 - tor/trunk/contrib

[nickm at seul.org]

Author: nickm
Date: 2006-07-25 18:30:50 -0400 (Tue, 25 Jul 2006)
New Revision: 6900

Modified:
   tor/trunk/contrib/checkSpace.pl
Log:
Allow wide lines if they have svn id tags in them. (This matters for svk: those tags can be *big*.)

Modified: tor/trunk/contrib/checkSpace.pl
===================================================================
--- tor/trunk/contrib/checkSpace.pl	2006-07-25 22:26:42 UTC (rev 6899)
+++ tor/trunk/contrib/checkSpace.pl	2006-07-25 22:30:50 UTC (rev 6900)
@@ -36,11 +36,11 @@
             $lastnil = 0;
         }
 	## Terminals are still 80 columns wide in my world.  I refuse to
-	## accept double-line lines.
-	if (/^.{80}/) {
+	## accept double-line lines.  Except, of course, svn Id tags
+	## can make us go long.
+	if (/^.{80}/ && !/\$Id: /) {
 	    print "     Wide:$fn:$.\n";
 	}
-
 	### Juju to skip over comments and strings, since the tests
 	### we're about to do are okay there.
 	if ($C) {
@@ -88,11 +88,10 @@
                 }
             }
 	    ## Warn about functions not declared at start of line.
-	    if ($in_func_head || 
+	    if ($in_func_head ||
 		($fn !~ /\.h$/ && /^[a-zA-Z0-9_]/ &&
 		 ! /^(?:static )?(?:typedef|struct|union)[^\(]*$/ &&
 		 ! /= *\{$/ && ! /;$/)) {
-		
 		if (/.\{$/){
 		    print "fn() {:$fn:$.\n";
 		    $in_func_head = 0;