[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm@xxxxxxxxxxxxxx]

commit 2968c716d7689eafcf32a1f5327af7b1ad1582ce
Merge: a3ec89a4f 1953a7e61
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Jun 29 23:11:47 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.1

 scripts/maint/checkSpace.pl | 5 -----
 1 file changed, 5 deletions(-)

diff --cc scripts/maint/checkSpace.pl
index 6d19d6ccd,5af95a27e..3043eb1aa
--- a/scripts/maint/checkSpace.pl
+++ b/scripts/maint/checkSpace.pl
@@@ -168,32 -157,25 +168,27 @@@ for my $fn (@ARGV) 
                  }
              }
  
 -	    ## Check for forbidden functions except when they are
 -	    # explicitly permitted
 -	    if (/\bassert\(/ && not /assert OK/) {
 -		print "assert :$fn:$.   (use tor_assert)\n";
 -	    }
 -	    if (/\bmemcmp\(/ && not /memcmp OK/) {
 -		print "memcmp :$fn:$.   (use {tor,fast}_mem{eq,neq,cmp}\n";
 -	    }
 -	    # always forbidden.
 -	    if (not / OVERRIDE /) {
 -		if (/\bstrcat\(/ or /\bstrcpy\(/ or /\bsprintf\(/) {
 -		    print "$& :$fn:$.\n";
 -		}
 -		if (/\bmalloc\(/ or /\bfree\(/ or /\brealloc\(/ or
 -		    /\bstrdup\(/ or /\bstrndup\(/ or /\bcalloc\(/) {
 -		    print "$& :$fn:$.    (use tor_malloc, tor_free, etc)\n";
 -		}
 -	    }
 +            ## Check for forbidden functions except when they are
 +            # explicitly permitted
 +            if (/\bassert\(/ && not /assert OK/) {
 +                msg "assert :$fn:$.   (use tor_assert)\n";
 +            }
 +            if (/\bmemcmp\(/ && not /memcmp OK/) {
 +                msg "memcmp :$fn:$.   (use {tor,fast}_mem{eq,neq,cmp}\n";
 +            }
 +            # always forbidden.
 +            if (not /\ OVERRIDE\ /) {
 +                if (/\bstrcat\(/ or /\bstrcpy\(/ or /\bsprintf\(/) {
 +                    msg "$& :$fn:$.\n";
 +                }
 +                if (/\bmalloc\(/ or /\bfree\(/ or /\brealloc\(/ or
 +                    /\bstrdup\(/ or /\bstrndup\(/ or /\bcalloc\(/) {
 +                    msg "$& :$fn:$.    (use tor_malloc, tor_free, etc)\n";
 +                }
 +            }
          }
      }
-     ## Warn if the file doesn't end with a blank line.
-     #    (End each file with a single blank line.)
-     if (! $lastnil) {
-         msg "  EOL\@EOF:$fn:$.\n";
-     }
      close(F);
  }
 +
 +exit $found;



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits