Skip to Content.
Sympa Menu

devel - Re: [sympa-developpers] [sympa-commits] sympa[10451] trunk/src: [dev] second round of import cleanup: enforce consistant usage of fully-qualified function names

Subject: Developers of Sympa

List archive

Re: [sympa-developpers] [sympa-commits] sympa[10451] trunk/src: [dev] second round of import cleanup: enforce consistant usage of fully-qualified function names

Chronological Thread  
    < Chronological >       < Thread >
  • From: IKEDA Soji <address@concealed>
  • To: address@concealed
  • Subject: Re: [sympa-developpers] [sympa-commits] sympa[10451] trunk/src: [dev] second round of import cleanup: enforce consistant usage of fully-qualified function names
  • Date: Wed, 19 Mar 2014 17:39:10 +0900
Hi,

I wrote a makeshift script to automate such works.
(Module names and so on might be changed as current layout on trunk.)

Regards,

--- Soji


On Wed, 19 Mar 2014 09:30:58 +0100 (CET)
address@concealed wrote:

> sympa[10451] trunk/src: [dev] second round of import cleanup: enforce
> consistant usage of fully-qualified function names
> Revision 10451 Author rousse Date 2014-03-19 09:30:58 +0100 (mer. 19 mars
> 2014)
> Log Message[dev] second round of import cleanup: enforce consistant usage
> of fully-qualified function names
> Modified Paths
> trunk/src/bin/sympa_wizard.pl.in
> trunk/src/cgi/wwsympa.fcgi.in
> trunk/src/lib/Sympa/Archive.pm
> trunk/src/lib/Sympa/Commands.pm
> trunk/src/lib/Sympa/Language.pm
> trunk/src/lib/Sympa/List.pm
> trunk/src/lib/Sympa/Log/Database.pm
> trunk/src/lib/Sympa/Log/Syslog.pm
> trunk/src/lib/Sympa/Mail.pm
> trunk/src/lib/Sympa/Marc/Search.pm
> trunk/src/lib/Sympa/Message.pm
> trunk/src/lib/Sympa/TaskInstruction.pm
> trunk/src/lib/Sympa/Template/Compat.pm
> trunk/src/lib/Sympa/Tools/Cookie.pm
> trunk/src/lib/Sympa/Tools/File.pm
> trunk/src/lib/Sympa/Tools/Message.pm
> trunk/src/lib/Sympa/Tools/Text.pm
> trunk/src/lib/Sympa/Tools/Time.pm
> trunk/src/lib/Sympa/Tools.pm
> trunk/src/lib/Sympa/Upgrade.pm
> trunk/src/libexec/ldap_alias_manager.pl.in
> trunk/src/libexec/mysql_alias_manager.pl.in
> trunk/src/sbin/bounced.pl.in
> trunk/src/sbin/sympa.pl.in
> Diff
> Modified: trunk/src/bin/sympa_wizard.pl.in (10450 => 10451)
> --- trunk/src/bin/sympa_wizard.pl.in 2014-03-19 08:23:40 UTC (rev 10450)
> +++ trunk/src/bin/sympa_wizard.pl.in 2014-03-19 08:30:58 UTC (rev 10451)
> @@ -81,7 +81,6 @@
> use English qw(-no_match_vars);
> use Getopt::Long;
> use Pod::Usage;
> -use POSIX qw(strftime);
> use Sys::Hostname qw(hostname);
>
> use Sympa::Constants;
> Modified: trunk/src/cgi/wwsympa.fcgi.in (10450 => 10451)
> --- trunk/src/cgi/wwsympa.fcgi.in 2014-03-19 08:23:40 UTC (rev 10450)
> +++ trunk/src/cgi/wwsympa.fcgi.in 2014-03-19 08:30:58 UTC (rev 10451)
> @@ -47,7 +47,8 @@
>
> use English; # FIXME: drop $MATCH usage
> use Archive::Zip qw(:ERROR_CODES);
> -use Time::Local;
> +use POSIX qw();
> +use Time::Local qw();
>
> use Sympa::Auth;
> use Sympa::Admin;
> @@ -10099,7 +10100,7 @@
> $yr = (localtime(time))[5];
> }
>
> - $time = timelocal($sec, $min, $hr, $mday, $mon, $yr);
> + $time = Time::Local::timelocal($sec, $min, $hr, $mday, $mon, $yr);
> return $time
>
> }
> @@ -21587,7 +21588,7 @@
> and 1900 <= $year1) {
> ## Return an epoch date
> $data->{'startdate'} =
> - timelocal(0, 0, 0, $day1, $month1 - 1, $year1);
> + Time::Local::timelocal(0, 0, 0, $day1, $month1 - 1,
> $year1);
> } else {
> Sympa::Report::reject_report_web('user', 'missing_arg',
> {'argument' => 'Start Date doesn\'t exist.'},
> @@ -21613,7 +21614,7 @@
> and 1900 <= $year2) {
> ## Return an epoch date
> $data->{'enddate'} =
> - timelocal(0, 0, 0, $day2, $month2 - 1, $year2);
> + Time::Local::timelocal(0, 0, 0, $day2, $month2 -
> 1, $year2);
> } else {
> Sympa::Report::reject_report_web('user', 'missing_arg',
> {'argument' => 'End Date doesn\'t exist.'},
> Modified: trunk/src/lib/Sympa/Archive.pm (10450 => 10451)
> --- trunk/src/lib/Sympa/Archive.pm 2014-03-19 08:23:40 UTC (rev 10450)
> +++ trunk/src/lib/Sympa/Archive.pm 2014-03-19 08:30:58 UTC (rev 10451)
> @@ -28,7 +28,7 @@
> use Carp qw(croak);
> use Cwd qw(getcwd);
> use Digest::MD5;
> -use Encode qw(decode_utf8 encode_utf8);
> +use Encode qw();
> use English qw(-no_match_vars);
> use HTML::Entities qw(decode_entities);
>
> @@ -261,7 +261,9 @@
>
> if (/^<!--(\S+): (.*) -->$/) {
> my ($key, $value) = ($1, $2);
> - $value = encode_utf8(decode_entities(decode_utf8($value)));
> + $value = Encode::encode_utf8(
> + decode_entities(Encode::decode_utf8($value))
> + );
> if ($key eq 'X-From-R13') {
> $metadata{'X-From'} = $value;
> ## Mhonarc protection of email addresses
> Modified: trunk/src/lib/Sympa/Commands.pm (10450 => 10451)
> --- trunk/src/lib/Sympa/Commands.pm 2014-03-19 08:23:40 UTC (rev 10450)
> +++ trunk/src/lib/Sympa/Commands.pm 2014-03-19 08:30:58 UTC (rev 10451)
> @@ -27,7 +27,6 @@
> use warnings;
>
> use Carp qw(carp);
> -use Time::Local;
>
> use Sympa::Language;
> use Sympa::List;
> Modified: trunk/src/lib/Sympa/Language.pm (10450 => 10451)
> --- trunk/src/lib/Sympa/Language.pm 2014-03-19 08:23:40 UTC (rev 10450)
> +++ trunk/src/lib/Sympa/Language.pm 2014-03-19 08:30:58 UTC (rev 10451)
> @@ -26,7 +26,7 @@
> use strict;
> use warnings;
>
> -use POSIX qw(setlocale strftime);
> +use POSIX qw();
> use Locale::Messages qw (:locale_h :libintl_h !gettext);
>
> use Sympa::Log::Syslog;
> Modified: trunk/src/lib/Sympa/List.pm (10450 => 10451)
> --- trunk/src/lib/Sympa/List.pm 2014-03-19 08:23:40 UTC (rev 10450)
> +++ trunk/src/lib/Sympa/List.pm 2014-03-19 08:30:58 UTC (rev 10451)
> @@ -29,14 +29,14 @@
>
> use Carp qw(croak);
> use Data::Dumper;
> -use Encode;
> +use Encode qw();
> use English; # FIXME: drop $PREMATCH usage
> use IO::Scalar;
> use LWP::UserAgent;
> use MIME::EncWords;
> -use POSIX;
> +use POSIX qw();
> use Storable qw(dclone);
> -use Time::Local qw(timelocal);
> +use Time::Local qw();
>
>
> use Sympa::Archive;
> @@ -5479,7 +5479,8 @@
>
> if (($now[2] * 60 + $now[1]) >= ($hh * 60 + $mm)
> and (
> - timelocal(0, $mm, $hh, $now[3], $now[4], $now[5]) > timelocal(
> + Time::Local::timelocal(0, $mm, $hh, $now[3], $now[4], $now[5])
> >
> + Time::Local::timelocal(
> 0, $timedigest[1], $timedigest[2],
> $timedigest[3], $timedigest[4], $timedigest[5]
> )
> Modified: trunk/src/lib/Sympa/Log/Database.pm (10450 => 10451)
> --- trunk/src/lib/Sympa/Log/Database.pm 2014-03-19 08:23:40 UTC (rev
> 10450)
> +++ trunk/src/lib/Sympa/Log/Database.pm 2014-03-19 08:30:58 UTC (rev
> 10451)
> @@ -27,8 +27,7 @@
> use English qw(-no_match_vars);
>
> #use Carp; # currently not used
> -#use Encode; # not used
> -use POSIX qw(mktime);
> +use POSIX qw();
> use Time::HiRes;
>
> use Sympa::Tools::Time;
> @@ -328,13 +327,13 @@
> #if the search is between two date
> if ($select->{'date_from'}) {
> my @tab_date_from = split /[-\/.]/, $select->{'date_from'};
> - my $date_from = mktime(
> + my $date_from = POSIX::mktime(
> 0, 0, -1, $tab_date_from[0],
> $tab_date_from[1] - 1,
> $tab_date_from[2] - 1900
> );
> unless ($select->{'date_to'}) {
> - my $date_from2 = mktime(
> + my $date_from2 = POSIX::mktime(
> 0, 0, 25, $tab_date_from[0],
> $tab_date_from[1] - 1,
> $tab_date_from[2] - 1900
> @@ -344,7 +343,7 @@
> }
> if ($select->{'date_to'}) {
> my @tab_date_to = split /[-\/.]/, $select->{'date_to'};
> - my $date_to = mktime(
> + my $date_to = POSIX::mktime(
> 0, 0, 25, $tab_date_to[0],
> $tab_date_to[1] - 1,
> $tab_date_to[2] - 1900
> Modified: trunk/src/lib/Sympa/Log/Syslog.pm (10450 => 10451)
> --- trunk/src/lib/Sympa/Log/Syslog.pm 2014-03-19 08:23:40 UTC (rev 10450)
> +++ trunk/src/lib/Sympa/Log/Syslog.pm 2014-03-19 08:30:58 UTC (rev 10451)
> @@ -27,7 +27,6 @@
> use English qw(-no_match_vars);
>
> #use Carp; # currently not used
> -#use Encode; # not used
> use Sys::Syslog;
>
> my ($log_facility, $log_socket_type, $log_service, $sth, @sth_stack,
> Modified: trunk/src/lib/Sympa/Mail.pm (10450 => 10451)
> --- trunk/src/lib/Sympa/Mail.pm 2014-03-19 08:23:40 UTC (rev 10450)
> +++ trunk/src/lib/Sympa/Mail.pm 2014-03-19 08:30:58 UTC (rev 10451)
> @@ -27,14 +27,14 @@
> use warnings;
>
> use Carp qw(carp croak);
> -use Encode;
> +use Encode qw();
> use English qw(-no_match_vars);
> use MIME::Charset;
> use MIME::EncWords;
> use MIME::Parser;
> use MIME::Tools;
> -use POSIX;
> -use Time::Local;
> +use POSIX qw();
> +use Time::Local qw();
>
> use Sympa::Bulk;
> use Sympa::Constants;
> @@ -198,7 +198,7 @@
>
> unless ($header_ok{'date'}) {
> my $now = time;
> - my $tzoff = timegm(localtime $now) - $now;
> + my $tzoff = Time::Local::timegm(localtime $now) - $now;
> my $sign;
> if ($tzoff < 0) {
> ($sign, $tzoff) = ('-', -$tzoff);
> Modified: trunk/src/lib/Sympa/Marc/Search.pm (10450 => 10451)
> --- trunk/src/lib/Sympa/Marc/Search.pm 2014-03-19 08:23:40 UTC (rev
> 10450)
> +++ trunk/src/lib/Sympa/Marc/Search.pm 2014-03-19 08:30:58 UTC (rev
> 10451)
> @@ -7,10 +7,10 @@
> use strict;
> use base qw(Sympa::Marc);
>
> +use Encode qw();
> use English qw(-no_match_vars);
> use File::Find;
> use HTML::Entities qw(decode_entities encode_entities);
> -use Encode qw(decode_utf8 encode_utf8 is_utf8);
>
> our $VERSION = "4.3";
> our ($AUTOLOAD, @MSGFILES);
> @@ -97,7 +97,8 @@
> if (scalar @_) {
> my $key_word = shift;
> if (defined $key_word) {
> - $key_word = decode_utf8($key_word) unless is_utf8($key_word);
> + $key_word = Encode::decode_utf8($key_word)
> + unless Encode::is_utf8($key_word);
> $self->{'key_word'} = $key_word;
> } else {
> $self->{'key_word'} = undef;
> @@ -220,9 +221,13 @@
> if ($s =~ /\n/) {
> push @rich, {'text' => '', 'format' => 'br'};
> } elsif ($s =~ /\001(.*)\002/) {
> - push @rich, {'text' => encode_utf8($1), 'format' =>
> 'b'};
> + push @rich, {
> + 'text' => Encode::encode_utf8($1), 'format' => 'b'
> + };
> } else {
> - push @rich, {'text' => encode_utf8($s), 'format' =>
> ''};
> + push @rich, {
> + 'text' => Encode::encode_utf8($s), 'format' => ''
> + };
> }
> }
> $res->{'rich'}->{$k} = \@rich;
> @@ -230,7 +235,7 @@
> $res->{$k} =~ s,\001,<B>,g;
> $res->{$k} =~ s,\002,</B>,g;
> $res->{$k} =~ s,\n,<BR/>,g;
> - $res->{$k} = encode_utf8($res->{$k});
> + $res->{$k} = Encode::encode_utf8($res->{$k});
> }
> push @{$self->{'res'}}, $res;
> }
> Modified: trunk/src/lib/Sympa/Message.pm (10450 => 10451)
> --- trunk/src/lib/Sympa/Message.pm 2014-03-19 08:23:40 UTC (rev 10450)
> +++ trunk/src/lib/Sympa/Message.pm 2014-03-19 08:30:58 UTC (rev 10451)
> @@ -55,7 +55,7 @@
> use MIME::Entity;
> use MIME::Parser;
> use MIME::Tools;
> -use POSIX qw(mkfifo);
> +use POSIX qw();
> use Storable qw(dclone);
> use URI::Escape;
>
> @@ -1031,7 +1031,7 @@
> Sympa::Log::Syslog::do_log('debug', 'Trying decrypt with %s, %s',
> $certfile, $keyfile);
> if (Sympa::Site->key_passwd ne '') {
> - unless (mkfifo($temporary_pwd, 0600)) {
> + unless (POSIX::mkfifo($temporary_pwd, 0600)) {
> Sympa::Log::Syslog::do_log('err',
> 'Unable to make fifo for %s',
> $temporary_pwd);
> @@ -1272,7 +1272,7 @@
> close(MSGDUMP);
>
> if (Sympa::Site->key_passwd ne '') {
> - unless (mkfifo($temporary_pwd, 0600)) {
> + unless (POSIX::mkfifo($temporary_pwd, 0600)) {
> Sympa::Log::Syslog::do_log('notice', 'Unable to make fifo for
> %s',
> $temporary_pwd);
> }
> Modified: trunk/src/lib/Sympa/TaskInstruction.pm (10450 => 10451)
> --- trunk/src/lib/Sympa/TaskInstruction.pm 2014-03-19 08:23:40 UTC (rev
> 10450)
> +++ trunk/src/lib/Sympa/TaskInstruction.pm 2014-03-19 08:30:58 UTC (rev
> 10451)
> @@ -26,7 +26,7 @@
> use strict;
>
> use English qw(-no_match_vars);
> -use Time::Local qw(timegm timelocal);
> +use Time::Local qw();
>
> use Sympa::List;
> use Sympa::Log::Syslog;
> @@ -763,7 +763,7 @@
> $min = 0;
> $sec = 0;
> my $date_end =
> - timelocal($sec, $min, $hour, $mday, $mon, $year, $wday, $yday,
> + Time::Local::timelocal($sec, $min, $hour, $mday, $mon, $year,
> $wday, $yday,
> $isdst);
>
> my $sth;
> @@ -1188,7 +1188,7 @@
> $date =~ /notAfter=(\w+)\s*(\d+)\s[\d\:]+\s(\d+).+/;
> my @date = (0, 0, 0, $2, $Sympa::TaskSpool::months{$1}, $3 - 1900);
> $date =~ s/notAfter=//;
> - my $expiration_date = timegm(@date); # epoch expiration date
> + my $expiration_date = Time::Local::timegm(@date);
> my $rep = Sympa::Tools::Time::adate($expiration_date);
>
> # no near expiration nor expiration processing
> @@ -1370,7 +1370,7 @@
>
> $date =~ /nextUpdate=(\w+)\s*(\d+)\s(\d\d)\:(\d\d)\:\d\d\s(\d+).+/;
> my @date = (0, $4, $3 - 1, $2, $Sympa::TaskSpool::months{$1}, $5 -
> 1900);
> - my $expiration_date = timegm(@date); # epoch expiration date
> + my $expiration_date = Time::Local::timegm(@date);
> my $rep = Sympa::Tools::Time::adate($expiration_date);
>
> ## check if the crl is soon expired or expired
> Modified: trunk/src/lib/Sympa/Template/Compat.pm (10450 => 10451)
> --- trunk/src/lib/Sympa/Template/Compat.pm 2014-03-19 08:23:40 UTC (rev
> 10450)
> +++ trunk/src/lib/Sympa/Template/Compat.pm 2014-03-19 08:30:58 UTC (rev
> 10451)
> @@ -25,7 +25,6 @@
>
> use strict;
> use base 'Template::Provider';
> -use Encode;
>
> sub _load {
> my ($self, $name, $alias) = @_;
> Modified: trunk/src/lib/Sympa/Tools/Cookie.pm (10450 => 10451)
> --- trunk/src/lib/Sympa/Tools/Cookie.pm 2014-03-19 08:23:40 UTC (rev
> 10450)
> +++ trunk/src/lib/Sympa/Tools/Cookie.pm 2014-03-19 08:30:58 UTC (rev
> 10451)
> @@ -26,7 +26,6 @@
> use strict "vars";
>
> use Digest::MD5;
> -use POSIX;
> use CGI::Cookie;
>
> use Sympa::Log::Syslog;
> Modified: trunk/src/lib/Sympa/Tools/File.pm (10450 => 10451)
> --- trunk/src/lib/Sympa/Tools/File.pm 2014-03-19 08:23:40 UTC (rev 10450)
> +++ trunk/src/lib/Sympa/Tools/File.pm 2014-03-19 08:30:58 UTC (rev 10451)
> @@ -30,7 +30,7 @@
> use English qw(-no_match_vars);
> use File::Copy::Recursive;
> use File::Find;
> -use POSIX qw(strftime);
> +use POSIX qw();
>
> use Sympa::Log::Syslog;
>
> @@ -182,7 +182,7 @@
> }
>
> my @date = localtime(time);
> - my $file_extention = strftime("%Y:%m:%d:%H:%M:%S", @date);
> + my $file_extention = POSIX::strftime("%Y:%m:%d:%H:%M:%S", @date);
>
> unless (rename($file, $file . '.' . $file_extention)) {
> Sympa::Log::Syslog::do_log('err',
> Modified: trunk/src/lib/Sympa/Tools/Message.pm (10450 => 10451)
> --- trunk/src/lib/Sympa/Tools/Message.pm 2014-03-19 08:23:40 UTC (rev
> 10450)
> +++ trunk/src/lib/Sympa/Tools/Message.pm 2014-03-19 08:30:58 UTC (rev
> 10451)
> @@ -26,14 +26,13 @@
> use strict;
>
> use Carp qw(croak);
> +use Encode qw();
> use English;
> -
> -use Encode;
> +use HTML::TreeBuilder;
> use Mail::Address;
> use MIME::EncWords;
> use MIME::Charset;
> use MIME::Decoder;
> -use HTML::TreeBuilder;
>
> use Sympa::HTML::MyFormatText;
> use Sympa::Language;
> Modified: trunk/src/lib/Sympa/Tools/Text.pm (10450 => 10451)
> --- trunk/src/lib/Sympa/Tools/Text.pm 2014-03-19 08:23:40 UTC (rev 10450)
> +++ trunk/src/lib/Sympa/Tools/Text.pm 2014-03-19 08:30:58 UTC (rev 10451)
> @@ -26,7 +26,7 @@
> use strict;
> use warnings;
>
> -use Encode;
> +use Encode qw();
> use Text::LineFold;
>
> use Sympa::Language;
> Modified: trunk/src/lib/Sympa/Tools/Time.pm (10450 => 10451)
> --- trunk/src/lib/Sympa/Tools/Time.pm 2014-03-19 08:23:40 UTC (rev 10450)
> +++ trunk/src/lib/Sympa/Tools/Time.pm 2014-03-19 08:30:58 UTC (rev 10451)
> @@ -25,8 +25,8 @@
>
> use strict;
>
> -use POSIX qw(strftime);
> -use Time::Local;
> +use POSIX qw();
> +use Time::Local qw();
>
> use Sympa::Log::Syslog;
>
> @@ -59,7 +59,7 @@
>
> my $epoch = $_[0];
> my @date = localtime($epoch);
> - my $date = strftime("%Y-%m-%d %H:%M:%S", @date);
> + my $date = POSIX::strftime("%Y-%m-%d %H:%M:%S", @date);
>
> return $date;
> }
> @@ -69,7 +69,7 @@
>
> my $epoch = $_[0];
> my @date = localtime($epoch);
> - my $date = strftime("%e %a %b %Y %H h %M min %S s", @date);
> + my $date = POSIX::strftime("%e %a %b %Y %H h %M min %S s", @date);
>
> return $date;
> }
> @@ -148,7 +148,7 @@
> $date[4]-- if ($date[4] != 0);
> $date[5] -= 1900;
>
> - return timelocal(@date);
> + return Time::Local::timelocal(@date);
> }
>
> return time;
> Modified: trunk/src/lib/Sympa/Tools.pm (10450 => 10451)
> --- trunk/src/lib/Sympa/Tools.pm 2014-03-19 08:23:40 UTC (rev 10450)
> +++ trunk/src/lib/Sympa/Tools.pm 2014-03-19 08:30:58 UTC (rev 10451)
> @@ -27,7 +27,7 @@
>
> use Carp qw(croak);
> use Digest::MD5;
> -use Encode;
> +use Encode qw();
> use English qw(-no_match_vars);
> use HTML::StripScripts::Parser;
> use MIME::Lite::HTML;
> Modified: trunk/src/lib/Sympa/Upgrade.pm (10450 => 10451)
> --- trunk/src/lib/Sympa/Upgrade.pm 2014-03-19 08:23:40 UTC (rev 10450)
> +++ trunk/src/lib/Sympa/Upgrade.pm 2014-03-19 08:30:58 UTC (rev 10451)
> @@ -28,7 +28,7 @@
> use Carp qw(croak);
> use English qw(-no_match_vars);
> use File::Copy::Recursive;
> -use POSIX qw(strftime);
> +use POSIX qw();
>
> use Sympa::Conf;
> use Sympa::Constants;
> @@ -1536,7 +1536,7 @@
>
> next unless $modified;
>
> - my $date = strftime("%Y.%m.%d-%H.%M.%S", localtime(time));
> + my $date = POSIX::strftime("%Y.%m.%d-%H.%M.%S", localtime(time));
> unless (rename $file, $file . '@' . $date) {
> Sympa::Log::Syslog::do_log('err', "Cannot rename old template
> %s",
> $file);
> Modified: trunk/src/libexec/ldap_alias_manager.pl.in (10450 => 10451)
> --- trunk/src/libexec/ldap_alias_manager.pl.in 2014-03-19 08:23:40
> UTC (rev 10450)
> +++ trunk/src/libexec/ldap_alias_manager.pl.in 2014-03-19 08:30:58
> UTC (rev 10451)
> @@ -49,7 +49,7 @@
> use English qw(-no_match_vars);
> use Net::LDAP;
> use Net::LDAPS;
> -use POSIX;
> +use POSIX qw();
>
> #use Conf; # load in Site - Robot
> #use Sympa::Tools; # load in Conf - Robot
> Modified: trunk/src/libexec/mysql_alias_manager.pl.in (10450 => 10451)
> --- trunk/src/libexec/mysql_alias_manager.pl.in 2014-03-19 08:23:40
> UTC (rev 10450)
> +++ trunk/src/libexec/mysql_alias_manager.pl.in 2014-03-19 08:30:58
> UTC (rev 10451)
> @@ -36,7 +36,7 @@
> use lib '--modulesdir--';
> use English qw(-no_match_vars);
> use DBI;
> -use POSIX;
> +use POSIX qw();
>
> #use Conf; # load in Site - Robot
> #use Sympa::Tools; # load in Conf - Robot
> Modified: trunk/src/sbin/bounced.pl.in (10450 => 10451)
> --- trunk/src/sbin/bounced.pl.in 2014-03-19 08:23:40 UTC (rev 10450)
> +++ trunk/src/sbin/bounced.pl.in 2014-03-19 08:30:58 UTC (rev 10451)
> @@ -144,7 +144,7 @@
> use English qw(-no_match_vars);
> use Getopt::Long;
> use Pod::Usage;
> -use POSIX;
> +use POSIX qw();
>
> use Sympa::BounceMessage;
> use Sympa::ClassicSpool;
> Modified: trunk/src/sbin/sympa.pl.in (10450 => 10451)
> --- trunk/src/sbin/sympa.pl.in 2014-03-19 08:23:40 UTC (rev 10450)
> +++ trunk/src/sbin/sympa.pl.in 2014-03-19 08:30:58 UTC (rev 10451)
> @@ -339,6 +339,7 @@
> use Getopt::Long;
> use MIME::Charset;
> use Pod::Usage;
> +use POSIX qw();
>
> use Sympa::Admin;
> use Sympa::ClassicSpool;


--
株式会社 コンバージョン セキュリティ&OSSソリューション部 池田荘児
〒231-0004　神奈川県横浜市中区元浜町3-21-2 ヘリオス関内ビル7F
e-mail address@concealed TEL 045-640-3550
http://www.conversion.co.jp/
#! perl

use strict;
use warnings;
use File::Find;

my @lib     = qw(src/lib wwsympa soap);
my %exports = (
    AuthCAS => [],
    Bounce  => [qw(anabounce rfc1891)],
    #TMPDEL#Carp    => [qw(carp confess croak)],
    Conf =>
        [qw(%Conf DAEMON_MESSAGE DAEMON_COMMAND DAEMON_CREATION DAEMON_ALL)],
    Cwd              => [qw(getcwd)],
    Encode           => [qw(decode_utf8 encode_utf8 is_utf8)],
    'Encode::Guess'  => [qw(guess_encoding)],
    Fcntl            => [qw(LOCK_SH LOCK_EX LOCK_NB LOCK_UN)],
    'HTML::Entities' => [qw(decode_entities encode_entities)],
    ##'JSON::XS' => [qw(decode_json encode_json)],
    Language => [qw(gettext gettext_strftime)],
    ##'List::Util' => [qw(first)],
    'Locale::Messages' => [
        qw(dgettext textdomain bindtextdomain bind_textdomain_codeset
            :locale_h :libintl_h !gettext)
    ],
    Log   => [qw(fatal_err do_log do_openlog)],
    POSIX => [qw(LC_ALL LC_TIME mkfifo mktime strftime strtod setlocale)],
    ##'Scalar::Util' => [qw(blessed)],
    ##SQLSource => [qw(create_db)],
    'Sys::Hostname' => [qw(hostname)],
    'URI::Escape'   => [qw(uri_escape uri_unescape)],
);

foreach my $dir (@lib) {
    find(
        sub {
            my $module = $File::Find::name;
            return unless $module =~ s/\.pm(?:\.in)?\z//;
            $module = substr $module, (length $dir) + 1;
            $module =~ s,/,::,g;
            $exports{$module} = [] unless exists $exports{$module};
        },
        $dir
    );
}

undef $/;
$_ = <>;
my $package = $1 if /\n ?package\s+([^\s;]+)\s*;/;

foreach my $ns (reverse sort keys %exports) {
    foreach my $fn (reverse sort @{$exports{$ns}}) {
        ## change exported names to fully-qualified names if they don't
        ## belong to current package.
        if ($package and $package eq $ns) {
            next if $fn =~ /^%/;
            next unless $fn =~ /\A\w+\z/;

            s/(?<!.\\|['"][<>])[&]($fn)\s*([(])/$1$2/g;
            s/(?<!::|.['"])\b($fn)\s*([(])/$1$2/g;
        } else {
            if ($fn =~ /^%(\w+)/) {
                my $varname = $1;
                s/\$($varname)\s*([{])/\$${ns}::$1$2/g;
                s/[%]($varname)(?!::)/\%${ns}::$1/g;

                next;
            }
            next unless $fn =~ /\A\w+\z/;

            s/(?<!.\\|['"][<>])[&]($fn)\s*([(])/${ns}::$1$2/g;
            s/(?<!::|.['"])\b($fn)\s*([(])/${ns}::$1$2/g;

            if ($fn =~ /\A[A-Z][_A-Z]*[A-Z]\z/) {    # constant
                s/(?<!::|.['"])\b($fn)(?![(])/${ns}::$1/g;
            }
        }
    }

    ## change "&NS::fn" without "()" to "NS::fn()"
    s/(?<!.\\|['"][<>])[&](${ns}::\w+)(\s*[^\s"'(\w])/$1()$2/g;
    ## otherwise change to "NS::fn"
    s/(?<!.\\|['"][<>])[&](?=${ns}::)//g;

    ## strip exports of used modules.
    s{\buse\s+(\S+)\s*qw\s*[/({]([\s:!\$\%\&\w]*)[/)}]\s*;}{
        my ($orig, $module, $words) = ($&, $1, $2);

        if (   $module eq 'base'
            or $module eq 'constant'
            or $module eq 'if'
            or $module eq 'lib'
            or $module eq 'strict'
            or $module eq 'warnings') {
            $orig;
        } elsif (!exists $exports{$module}) {
            $orig;
        } elsif (!@{$exports{$module}}) {
            $orig;
        } else {
            my @exported = @{$exports{$module}};
            my @words =
                grep {
                    my $w = $_;
                    !grep { $_ eq $w } @exported
                }
                split /\s+/, $words;
            if (@words) {
                sprintf 'use %s qw(%s);', $module, join(' ', @words);
            } else {
                sprintf 'use %s;', $module;
            }
        }
    }eg;

##    if ($package and $package eq $ns) {
##	s/\b${ns}:://g;
##    }
}

## change "&fn" without "()" to "fn()"
s{(?<!.\\|['"][<>])[&](\w+)(\s*[^:\s"'(\w])}{
    my ($orig, $fn, $cont) = ($&, $1, $2);
    ($fn =~ /^(apos|amp|gt|lt|quot)$/) ? $orig : "$fn()$cont"
}eg;
## otherwise change to "fn"
s{(?<!.\\|['"][<>])[&](\w+)\b(?!::)}{
    my ($orig, $fn) = ($&, $1);
    ($fn =~ /^(apos|amp|gt|lt|quot)$/) ? $orig : $fn
}eg;

print $_;

  • Re: [sympa-developpers] [sympa-commits] sympa[10451] trunk/src: [dev] second round of import cleanup: enforce consistant usage of fully-qualified function names, IKEDA Soji, 03/19/2014

Archive powered by MHonArc 2.6.19+.

Top of Page