undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

send-email: Cleanup { style

Browse Source 
As Jakub Narebski pointed out on the list, Perl code usually prefers

  sub func {
  }

over

  sub func
  {
  }

git-send-email.perl is somewhat inconsistent in its style, with 23
subroutines using the first style and 6 using the second.  Convert the
few odd subroutines so that the code matches normal Perl style.

Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brian Gernhardt 2010-04-10 10:53:53 -04:00 committed by Junio C Hamano
parent 134550fe21
commit 68ce93307f
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
git-send-email.perl
View File

@ -752,8 +752,7 @@ sub extract_valid_address {
# We'll setup a template for the message id, using the "from" address: # We'll setup a template for the message id, using the "from" address:
my ($message_id_stamp, $message_id_serial); my ($message_id_stamp, $message_id_serial);
sub make_message_id sub make_message_id {
{
my $uniq; my $uniq;
if (!defined $message_id_stamp) { if (!defined $message_id_stamp) {
$message_id_stamp = sprintf("%s-%s", time, $$); $message_id_stamp = sprintf("%s-%s", time, $$);
@ -808,8 +807,7 @@ sub is_rfc2047_quoted {
} }
# use the simplest quoting being able to handle the recipient # use the simplest quoting being able to handle the recipient
sub sanitize_address sub sanitize_address {
{
my ($recipient) = @_; my ($recipient) = @_;
my ($recipient_name, $recipient_addr) = ($recipient =~ /^(.*?)\s*(<.*)/); my ($recipient_name, $recipient_addr) = ($recipient =~ /^(.*?)\s*(<.*)/);
@ -854,8 +852,7 @@ sub sanitize_address
# This maildomain*() code is based on ideas in Perl library Test::Reporter # This maildomain*() code is based on ideas in Perl library Test::Reporter
# /usr/share/perl5/Test/Reporter/Mail/Util.pm ==> sub _maildomain () # /usr/share/perl5/Test/Reporter/Mail/Util.pm ==> sub _maildomain ()
sub maildomain_net sub maildomain_net {
{
my $maildomain; my $maildomain;
if (eval { require Net::Domain; 1 }) { if (eval { require Net::Domain; 1 }) {
@ -867,8 +864,7 @@ sub maildomain_net
return $maildomain; return $maildomain;
} }
sub maildomain_mta sub maildomain_mta {
{
my $maildomain; my $maildomain;
if (eval { require Net::SMTP; 1 }) { if (eval { require Net::SMTP; 1 }) {
@ -889,8 +885,7 @@ sub maildomain_mta
return $maildomain; return $maildomain;
} }
sub maildomain sub maildomain {
{
return maildomain_net() || maildomain_mta() || $mail_domain_default; return maildomain_net() || maildomain_mta() || $mail_domain_default;
} }
@ -898,8 +893,7 @@ sub maildomain
# In actuality, the whole program dies when there # In actuality, the whole program dies when there
# is an error sending a message. # is an error sending a message.
sub send_message sub send_message {
{
my @recipients = unique_email_list(@to); my @recipients = unique_email_list(@to);
@cc = (grep { my $cc = extract_valid_address($_); @cc = (grep { my $cc = extract_valid_address($_);
not grep { $cc eq $_ } @recipients not grep { $cc eq $_ } @recipients