[PATCH 4/6] Add explict return to end of subroutines
From: Bill Pemberton <hidden>
Date: 2016-06-15 22:46:41
Subsystem:
the rest · Maintainer:
Linus Torvalds
In perl a subroutine that ends without an explicit return will return the value of the last expression evalutated. This can lead to unexpected return values. Signed-off-by: Bill Pemberton <redacted> --- git-send-email.perl | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index 1ed5869..c24e0df 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl@@ -160,6 +160,7 @@ my $compose_filename; # Handle interactive edition of files. my $multiedit; my $editor = $ENV{GIT_EDITOR} || Git::config(@repo, "core.editor") || $ENV{VISUAL} || $ENV{EDITOR} || "vi"; + sub do_edit { if (defined($multiedit) && !$multiedit) { map {
@@ -174,6 +175,7 @@ sub do_edit { die("the editor exited uncleanly, aborting everything"); } } + return; } # Variables with corresponding config settings
@@ -304,6 +306,7 @@ sub read_config { $smtp_encryption = 'ssl'; } } + return; } # read configuration from [sendemail "$identity"], fall back on [sendemail]
@@ -745,6 +748,7 @@ sub make_message_id my $message_id_template = "<%s-git-send-email-%s>"; $message_id = sprintf($message_id_template, $uniq, $du_part); #print "new message id = $message_id\n"; # Was useful for debugging + return; }
@@ -971,6 +975,7 @@ X-Mailer: git-send-email $gitversion print "Result: OK\n"; } } + return; } $reply_to = $initial_reply_to;
@@ -1149,6 +1154,7 @@ cleanup_compose_files(); sub cleanup_compose_files { unlink($compose_filename, $compose_filename . ".final") if $compose; + return; } $smtp->quit if $smtp;
--
1.6.0.6