From e18a02a6cdeab2c4731f61775d74f6512ddf41fd Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Sun, 30 Sep 2012 15:49:18 +0200
Subject: [PATCH] [perl5db] Extract a subroutine.

---
 lib/perl5db.pl | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/lib/perl5db.pl b/lib/perl5db.pl
index baee447..0ff2770 100644
--- a/lib/perl5db.pl
+++ b/lib/perl5db.pl
@@ -1379,23 +1379,10 @@ back into the appropriate spots in the debugger.
 
 use vars qw(@hist @truehist %postponed_file @typeahead);
 
-if ( exists $ENV{PERLDB_RESTART} ) {
-
-    # We're restarting, so we don't need the flag that says to restart anymore.
-    delete $ENV{PERLDB_RESTART};
+sub _restore_breakpoints_and_actions {
 
-    # $restart = 1;
-    @hist          = get_list('PERLDB_HIST');
-    %break_on_load = get_list("PERLDB_ON_LOAD");
-    %postponed     = get_list("PERLDB_POSTPONE");
-
-	share(@hist);
-	share(@truehist);
-	share(%break_on_load);
-	share(%postponed);
-
-    # restore breakpoints/actions
     my @had_breakpoints = get_list("PERLDB_VISITED");
+
     for my $file_idx ( 0 .. $#had_breakpoints ) {
         my $filename = $had_breakpoints[$file_idx];
         my %pf = get_list("PERLDB_FILE_$file_idx");
@@ -1411,6 +1398,26 @@ if ( exists $ENV{PERLDB_RESTART} ) {
         }
     }
 
+    return;
+}
+
+if ( exists $ENV{PERLDB_RESTART} ) {
+
+    # We're restarting, so we don't need the flag that says to restart anymore.
+    delete $ENV{PERLDB_RESTART};
+
+    # $restart = 1;
+    @hist          = get_list('PERLDB_HIST');
+    %break_on_load = get_list("PERLDB_ON_LOAD");
+    %postponed     = get_list("PERLDB_POSTPONE");
+
+    share(@hist);
+    share(@truehist);
+    share(%break_on_load);
+    share(%postponed);
+
+    _restore_breakpoints_and_actions();
+
     # restore options
     my %opt = get_list("PERLDB_OPT");
     my ( $opt, $val );
-- 
2.7.4