In perl.git, the branch maint-5.10 has been updated <http://perl5.git.perl.org/perl.git/commitdiff/676c8ade29535aa1312c8a6416c41eb38ff1e312?hp=82ec13094bed7d1bb124bf1c2da67954ae6ca49f>
- Log ----------------------------------------------------------------- commit 676c8ade29535aa1312c8a6416c41eb38ff1e312 Author: David Mitchell <[email protected]> Date: Mon Jul 6 15:43:17 2009 +0100 clarify usage of Porting/Maintainers (cherry picked from commit b7bed276c4a311dde28f57407357a173a7210a28) M Porting/Maintainers.pm commit 4049dc8f56b102557946b6196a29802495b8793f Author: Paul Fenwick <[email protected]> Date: Mon Jul 6 20:27:49 2009 +1000 Maintainers.pl: Explanation as to why autodie tests are excluded. Signed-off-by: H.Merijn Brand <[email protected]> (cherry picked from commit cceec0529697541723782425186b8fc270f032a2) M Porting/Maintainers.pl commit 6f11e2c76e0774f8819d5eb06e22016a189e633e Author: Jan Dubois <[email protected]> Date: Fri Jul 3 17:56:11 2009 -0700 The 2nd arg to save_alloc() must be cast to I32 to avoid pointer truncation warnings on 64-bit platforms. (cherry picked from commit 6b99f28a36db89d4a6baa5b8598d15bfe4b998cb) M scope.h commit 1fee576536334de0841749e5057122f5363ef608 Author: Offer Kaye <[email protected]> Date: Mon Jul 6 12:02:52 2009 +0300 Added missing 2009 to perl.h copyright header (cherry picked from commit 5cd3f21a9a59e2e0e29512753fbc2dba75e690c0) M perl.h ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 6 ++++++ Porting/Maintainers.pm | 27 +++++++++++++++++---------- perl.h | 2 +- scope.h | 2 +- 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 3d4189b..d897b42 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -208,6 +208,12 @@ package Maintainers; 'DISTRIBUTION' => 'PJF/autodie-2.05.tar.gz', 'FILES' => q[lib/Fatal.pm lib/autodie.pm lib/autodie], 'EXCLUDED' => [ qr{^inc/Module/}, + + # All these tests depend upon external + # modules that don't exist when we're + # building the core. Hence, they can + # never run, and should not be merged. + qw( t/boilerplate.t t/critic.t diff --git a/Porting/Maintainers.pm b/Porting/Maintainers.pm index ee1c7cd..5cc9ebd 100644 --- a/Porting/Maintainers.pm +++ b/Porting/Maintainers.pm @@ -102,18 +102,24 @@ sub get_maintainer_modules { } sub usage { - print <<__EOF__; -$0: Usage: $0 [[--maintainer M --module M --files]|[--check] [commit] | [file ...] ---maintainer M list all maintainers matching M ---module M list all modules matching M ---files list all files ---check check consistency of Maintainers.pl + warn <<__EOF__; +$0: Usage: + --maintainer M | --module M [--files] + List modules or maintainers matching the pattern M. + With --files, list all the files associated with them +or + --check | --checkmani [commit | file ... | dir ... ] + Check consistency of Maintainers.pl with a file checks if it has a maintainer with a dir checks all files have a maintainer - otherwise checks for multiple maintainers ---checkmani like --check, but only reports on unclaimed files if they - are in MANIFEST ---opened list all modules of modified files + with a commit checks files modified by that commit + no arg checks for multiple maintainers + --checkmani is like --check, but only reports on unclaimed + files if they are in MANIFEST +or + --opened | file .... + List the module ownership of modified or the listed files + Matching is case-ignoring regexp, author matching is both by the short id and by the full name and email. A "module" may not be just a module, it may be a file or files or a subdirectory. @@ -144,6 +150,7 @@ sub process_options { my @Files; if ($Opened) { + usage if @ARGV; chomp (@Files = `git ls-files -m --full-name`); die if $?; } elsif (@ARGV == 1 && diff --git a/perl.h b/perl.h index f0a26d9..999d5fb 100644 --- a/perl.h +++ b/perl.h @@ -1,7 +1,7 @@ /* perl.h * * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 - * 2002, 2003, 2004, 2005, 2006, 2007, 2008 by Larry Wall and others + * 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by Larry Wall and others * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. diff --git a/scope.h b/scope.h index ebfe7b3..b697676 100644 --- a/scope.h +++ b/scope.h @@ -217,7 +217,7 @@ Closing bracket on a callback. See C<ENTER> and L<perlcall>. #define SSNEW(size) Perl_save_alloc(aTHX_ (size), 0) #define SSNEWt(n,t) SSNEW((n)*sizeof(t)) #define SSNEWa(size,align) Perl_save_alloc(aTHX_ (size), \ - (align - ((int)((caddr_t)&PL_savestack[PL_savestack_ix]) % align)) % align) + (I32)(align - ((size_t)((caddr_t)&PL_savestack[PL_savestack_ix]) % align)) % align) #define SSNEWat(n,t,align) SSNEWa((n)*sizeof(t), align) #define SSPTR(off,type) ((type) ((char*)PL_savestack + off)) -- Perl5 Master Repository
